diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index bf75438..3449c73 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -6,7 +6,6 @@ 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.ExportDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -14,8 +13,14 @@ import com.casic.missiles.dto.quality.BizQualityManagementReviewVO; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.file.QualityConferenceRelFileTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityManagementReview; +import com.casic.missiles.model.quality.BizQualityManagementReviewFile; +import com.casic.missiles.model.quality.base.QualityManagementReviewFileTypeEnum; +import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.quality.IBizQualityManagementReviewFileService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,9 +28,9 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * 管理评审管理Controller @@ -39,9 +44,11 @@ public class BizQualityManagementReviewController extends BaseController { private final IBizQualityManagementReviewService bizQualityManagementReviewService; + private final IBizQualityManagementReviewFileService reviewFileService; - public BizQualityManagementReviewController(IBizQualityManagementReviewService bizQualityManagementReviewService) { + public BizQualityManagementReviewController(IBizQualityManagementReviewService bizQualityManagementReviewService, IBizQualityManagementReviewFileService reviewFileService) { this.bizQualityManagementReviewService = bizQualityManagementReviewService; + this.reviewFileService = reviewFileService; } @ApiOperation("列表查询") @@ -54,7 +61,7 @@ @ApiOperation("快捷操作总数") @GetMapping(value = "/quickAction") public ReturnDTO> quickAction(@ApiParam("管理评审ID") Long id) { - List dtoList= bizQualityManagementReviewService.quickActions(id); + List dtoList = bizQualityManagementReviewService.quickActions(id); return ReturnUtil.success(dtoList); } @@ -68,6 +75,39 @@ return ReturnUtil.success(super.packForBT(page)); } + @ApiOperation("创建其他评审材料") + @PostMapping(value = "/addOther") + public ReturnDTO addOther(@RequestBody BizQualityManagementReviewFile managementReviewFile) { + Assert.isFalse(Objects.isNull(managementReviewFile.getManagementId()), () -> { + throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); + }); + List reviewFileList = new ArrayList<>(); + reviewFileList.add(managementReviewFile); + reviewFileService.saveList(reviewFileList, managementReviewFile.getManagementId()); + return ReturnUtil.success(); + } + + /** + * 会议关联工作列表查询 + * + * @return + */ + @ApiOperation("其他材料关联文件") + @GetMapping(value = "/otherFileTypes") + public ReturnDTO> otherFileTypes() { + List dictList = QualityManagementReviewFileTypeEnum.FILE_LIST; + List> mapList = + dictList.stream().map(dict -> { + QualityManagementReviewFileTypeEnum typeEnum = QualityManagementReviewFileTypeEnum.typeOfCode(Integer.valueOf(dict.getCode())); + Map map = new HashMap<>(); + map.put("code", dict.getCode()); + map.put("name", dict.getTypeName()); + typeEnum.wrapMap(map); + return map; + }).collect(Collectors.toList()); + return ReturnUtil.success(mapList); + } + @ApiOperation("新增接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityManagementReview bizQualityManagementReview) { @@ -75,7 +115,6 @@ return ReturnUtil.success(); } - @ApiOperation("修改接口") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityManagementReview bizQualityManagementReview) { @@ -105,6 +144,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index bf75438..3449c73 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -6,7 +6,6 @@ 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.ExportDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -14,8 +13,14 @@ import com.casic.missiles.dto.quality.BizQualityManagementReviewVO; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.file.QualityConferenceRelFileTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityManagementReview; +import com.casic.missiles.model.quality.BizQualityManagementReviewFile; +import com.casic.missiles.model.quality.base.QualityManagementReviewFileTypeEnum; +import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.quality.IBizQualityManagementReviewFileService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,9 +28,9 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * 管理评审管理Controller @@ -39,9 +44,11 @@ public class BizQualityManagementReviewController extends BaseController { private final IBizQualityManagementReviewService bizQualityManagementReviewService; + private final IBizQualityManagementReviewFileService reviewFileService; - public BizQualityManagementReviewController(IBizQualityManagementReviewService bizQualityManagementReviewService) { + public BizQualityManagementReviewController(IBizQualityManagementReviewService bizQualityManagementReviewService, IBizQualityManagementReviewFileService reviewFileService) { this.bizQualityManagementReviewService = bizQualityManagementReviewService; + this.reviewFileService = reviewFileService; } @ApiOperation("列表查询") @@ -54,7 +61,7 @@ @ApiOperation("快捷操作总数") @GetMapping(value = "/quickAction") public ReturnDTO> quickAction(@ApiParam("管理评审ID") Long id) { - List dtoList= bizQualityManagementReviewService.quickActions(id); + List dtoList = bizQualityManagementReviewService.quickActions(id); return ReturnUtil.success(dtoList); } @@ -68,6 +75,39 @@ return ReturnUtil.success(super.packForBT(page)); } + @ApiOperation("创建其他评审材料") + @PostMapping(value = "/addOther") + public ReturnDTO addOther(@RequestBody BizQualityManagementReviewFile managementReviewFile) { + Assert.isFalse(Objects.isNull(managementReviewFile.getManagementId()), () -> { + throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); + }); + List reviewFileList = new ArrayList<>(); + reviewFileList.add(managementReviewFile); + reviewFileService.saveList(reviewFileList, managementReviewFile.getManagementId()); + return ReturnUtil.success(); + } + + /** + * 会议关联工作列表查询 + * + * @return + */ + @ApiOperation("其他材料关联文件") + @GetMapping(value = "/otherFileTypes") + public ReturnDTO> otherFileTypes() { + List dictList = QualityManagementReviewFileTypeEnum.FILE_LIST; + List> mapList = + dictList.stream().map(dict -> { + QualityManagementReviewFileTypeEnum typeEnum = QualityManagementReviewFileTypeEnum.typeOfCode(Integer.valueOf(dict.getCode())); + Map map = new HashMap<>(); + map.put("code", dict.getCode()); + map.put("name", dict.getTypeName()); + typeEnum.wrapMap(map); + return map; + }).collect(Collectors.toList()); + return ReturnUtil.success(mapList); + } + @ApiOperation("新增接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityManagementReview bizQualityManagementReview) { @@ -75,7 +115,6 @@ return ReturnUtil.success(); } - @ApiOperation("修改接口") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityManagementReview bizQualityManagementReview) { @@ -105,6 +144,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java index 923eac8..9778d73 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java @@ -1,31 +1,52 @@ package com.casic.missiles.model.quality.base; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * @Description: 管理评审文档类型定义 * @Author: lwh * @Date: 2023/8/10 19:40 */ public enum QualityManagementReviewFileTypeEnum { - QUALITY_MONITORING_REPORT(1, "质量目标监测报告", QualityManagementReviewSourceTypeEnum.OBJECTIVE_EVALUATION_REPORT), - MANAGEMENT_SYSTEM_OPERATION(2, "质量管理体系运行报告", QualityManagementReviewSourceTypeEnum.SYSTEM_OPERATION_REPORT), - EQUIPMENT_SUPPLIER(3, "设备供方评价表", QualityManagementReviewSourceTypeEnum.OTHER_REVIEW_MATERIALS), - EXTERNAL_SERVICES(4, "外部服务评价表", QualityManagementReviewSourceTypeEnum.OTHER_REVIEW_MATERIALS), - CONSUMABLE_MATERIALS(5, "易耗物资供方评价表", QualityManagementReviewSourceTypeEnum.OTHER_REVIEW_MATERIALS), - SITUATION_ENTRUSTING_PARTY(6, "委托方情况报告", QualityManagementReviewSourceTypeEnum.OTHER_REVIEW_MATERIALS), - OTHER_MATERIALS(7, "其他材料", QualityManagementReviewSourceTypeEnum.OTHER_REVIEW_MATERIALS), - QUALITY_MANAGEMENT_SYSTEM(8, "管理评审计划", QualityManagementReviewSourceTypeEnum.REVIEW_PLAN), - MANAGEMENT_REVIEW(9, "管理评审报告", QualityManagementReviewSourceTypeEnum.MANAGEMENT_AUDIT_REPORT), - EFFECTIVENESS(10, "有效性综合分析报告", QualityManagementReviewSourceTypeEnum.EFFECTIVENESS_REPORT), - MEETING_MINUTES(11, "会议纪要", QualityManagementReviewSourceTypeEnum.MEETING_MINUTES); + QUALITY_MONITORING_REPORT(1, "质量目标监测报告", "", "", QualityManagementReviewSourceTypeEnum.OBJECTIVE_EVALUATION_REPORT), + MANAGEMENT_SYSTEM_OPERATION(2, "质量管理体系运行报告", "", "", QualityManagementReviewSourceTypeEnum.SYSTEM_OPERATION_REPORT), + + //前端查询 + EQUIPMENT_SUPPLIER(3, "设备供方评价表", "/resource/supplier/evaluate/approval/listPage", "zyglsbgfpjb", QualityManagementReviewSourceTypeEnum.OTHER_REVIEW_MATERIALS), + EXTERNAL_SERVICES(4, "外部服务评价表", "/resource/supplier/serviceEvaluate/approval/listPage", "zyglwbfwpjb", QualityManagementReviewSourceTypeEnum.OTHER_REVIEW_MATERIALS), + CONSUMABLE_MATERIALS(5, "易耗物资供方评价表", "/resource/supplier/consumableGoodsEvaluate/approval/listPage", "zyglyhwzgfpjb", QualityManagementReviewSourceTypeEnum.OTHER_REVIEW_MATERIALS), + SITUATION_ENTRUSTING_PARTY(6, "委托方情况报告", "/resource/customer/situationReport/listPage", "", QualityManagementReviewSourceTypeEnum.OTHER_REVIEW_MATERIALS), + OTHER_MATERIALS(7, "其他材料", "", "", QualityManagementReviewSourceTypeEnum.OTHER_REVIEW_MATERIALS), + + QUALITY_MANAGEMENT_SYSTEM(8, "管理评审计划", "", "", QualityManagementReviewSourceTypeEnum.REVIEW_PLAN), + MANAGEMENT_REVIEW(9, "管理评审报告", "", "", QualityManagementReviewSourceTypeEnum.MANAGEMENT_AUDIT_REPORT), + EFFECTIVENESS(10, "有效性综合分析报告", "", "", QualityManagementReviewSourceTypeEnum.EFFECTIVENESS_REPORT), + MEETING_MINUTES(11, "会议纪要", "", "", QualityManagementReviewSourceTypeEnum.MEETING_MINUTES); + + public static List FILE_LIST = new ArrayList(); + + static { + FILE_LIST.add(EQUIPMENT_SUPPLIER); + FILE_LIST.add(EXTERNAL_SERVICES); + FILE_LIST.add(CONSUMABLE_MATERIALS); + FILE_LIST.add(SITUATION_ENTRUSTING_PARTY); + FILE_LIST.add(OTHER_MATERIALS); + } private Integer code; private String typeName; private QualityManagementReviewSourceTypeEnum sourceTypeEnum; + private String url; + private String formId; - QualityManagementReviewFileTypeEnum(Integer code, String typeName, QualityManagementReviewSourceTypeEnum sourceTypeEnum) { + QualityManagementReviewFileTypeEnum(Integer code, String typeName, String url, String formId, QualityManagementReviewSourceTypeEnum sourceTypeEnum) { this.code = code; this.sourceTypeEnum = sourceTypeEnum; this.typeName = typeName; + this.url = url; + this.formId = formId; } public Integer getCode() { @@ -35,26 +56,62 @@ public String getTypeName() { return typeName; } - public static QualityManagementReviewFileTypeEnum typeOfCode(Integer code){ + + public String getUrl() { + return url; + } + + public String getFormId() { + return formId; + } + + public static QualityManagementReviewFileTypeEnum typeOfCode(Integer code) { QualityManagementReviewFileTypeEnum enums = null; - switch (code){ - case 1: enums=QUALITY_MONITORING_REPORT;break; - case 2: enums=MANAGEMENT_SYSTEM_OPERATION;break; - case 3: enums=EQUIPMENT_SUPPLIER;break; - case 4: enums=EXTERNAL_SERVICES;break; - case 5: enums=CONSUMABLE_MATERIALS;break; - case 6: enums=SITUATION_ENTRUSTING_PARTY;break; - case 8: enums=QUALITY_MANAGEMENT_SYSTEM;break; - case 9: enums=MANAGEMENT_REVIEW;break; - case 10: enums=EFFECTIVENESS;break; - case 11: enums=MEETING_MINUTES;break; - default: enums=OTHER_MATERIALS;break; + switch (code) { + case 1: + enums = QUALITY_MONITORING_REPORT; + break; + case 2: + enums = MANAGEMENT_SYSTEM_OPERATION; + break; + case 3: + enums = EQUIPMENT_SUPPLIER; + break; + case 4: + enums = EXTERNAL_SERVICES; + break; + case 5: + enums = CONSUMABLE_MATERIALS; + break; + case 6: + enums = SITUATION_ENTRUSTING_PARTY; + break; + case 8: + enums = QUALITY_MANAGEMENT_SYSTEM; + break; + case 9: + enums = MANAGEMENT_REVIEW; + break; + case 10: + enums = EFFECTIVENESS; + break; + case 11: + enums = MEETING_MINUTES; + break; + default: + enums = OTHER_MATERIALS; + break; } return enums; } + public QualityManagementReviewSourceTypeEnum getSourceTypeEnum() { return sourceTypeEnum; } + public void wrapMap(Map map) { + map.put("tips", this.getUrl()); + map.put("formId", this.getFormId()); + } }