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 dd7b309..4c1693f 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -13,9 +14,11 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.quality.QualitySelectDTO; import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.file.QualityConferenceRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityConferenceRecord; +import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,7 +28,10 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** @@ -42,10 +48,11 @@ private final IBizQualityConferenceRecordService bizQualityConferenceRecordService; private final AbstractPermissionContext permissionContext; - - public BizQualityConferenceRecordController(IBizQualityConferenceRecordService bizQualityConferenceRecordService, AbstractPermissionContext permissionContext) { + private final AbstractDictService dictService; + public BizQualityConferenceRecordController(IBizQualityConferenceRecordService bizQualityConferenceRecordService, AbstractPermissionContext permissionContext, AbstractDictService dictService) { this.bizQualityConferenceRecordService = bizQualityConferenceRecordService; this.permissionContext = permissionContext; + this.dictService = dictService; } @@ -163,13 +170,24 @@ } /** - * 关联工作查询接口-t + * 纠正措施处理单列表 + * + * @return */ - @ApiOperation("关联工作查询接口-待完善") - @GetMapping(value = "/relWork") - public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { - List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); - return ReturnUtil.success(qualitySelectDTOS); + @ApiOperation("关联工作查询") + @GetMapping(value = "/fileTypes") + public ReturnDTO> relFileList() { + List dictList = dictService.findInDictByCode(QualityDictTypeEnum.CONFERENCE_RECORD_FILE_TYPE.getCode()); + List> mapList = + dictList.stream().map(dict -> { + QualityConferenceRelFileTypeEnum typeEnum = QualityConferenceRelFileTypeEnum.typeOfCode(Integer.valueOf(dict.getCode())); + Map map = new HashMap<>(); + map.put("code", dict.getCode()); + map.put("name", dict.getName()); + typeEnum.wrapMap(map); + return map; + }).collect(Collectors.toList()); + return ReturnUtil.success(mapList); } @ApiOperation("导出word/pdf/打印") @@ -177,4 +195,4 @@ public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 } -} +} \ No newline at end of file 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 dd7b309..4c1693f 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -13,9 +14,11 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.quality.QualitySelectDTO; import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.file.QualityConferenceRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityConferenceRecord; +import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,7 +28,10 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** @@ -42,10 +48,11 @@ private final IBizQualityConferenceRecordService bizQualityConferenceRecordService; private final AbstractPermissionContext permissionContext; - - public BizQualityConferenceRecordController(IBizQualityConferenceRecordService bizQualityConferenceRecordService, AbstractPermissionContext permissionContext) { + private final AbstractDictService dictService; + public BizQualityConferenceRecordController(IBizQualityConferenceRecordService bizQualityConferenceRecordService, AbstractPermissionContext permissionContext, AbstractDictService dictService) { this.bizQualityConferenceRecordService = bizQualityConferenceRecordService; this.permissionContext = permissionContext; + this.dictService = dictService; } @@ -163,13 +170,24 @@ } /** - * 关联工作查询接口-t + * 纠正措施处理单列表 + * + * @return */ - @ApiOperation("关联工作查询接口-待完善") - @GetMapping(value = "/relWork") - public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { - List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); - return ReturnUtil.success(qualitySelectDTOS); + @ApiOperation("关联工作查询") + @GetMapping(value = "/fileTypes") + public ReturnDTO> relFileList() { + List dictList = dictService.findInDictByCode(QualityDictTypeEnum.CONFERENCE_RECORD_FILE_TYPE.getCode()); + List> mapList = + dictList.stream().map(dict -> { + QualityConferenceRelFileTypeEnum typeEnum = QualityConferenceRelFileTypeEnum.typeOfCode(Integer.valueOf(dict.getCode())); + Map map = new HashMap<>(); + map.put("code", dict.getCode()); + map.put("name", dict.getName()); + typeEnum.wrapMap(map); + return map; + }).collect(Collectors.toList()); + return ReturnUtil.success(mapList); } @ApiOperation("导出word/pdf/打印") @@ -177,4 +195,4 @@ public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 } -} +} \ No newline at end of file diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityDictTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityDictTypeEnum.java index 8add8e0..aee408b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityDictTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityDictTypeEnum.java @@ -11,6 +11,7 @@ AUDIT_MANAGEMENT_STAGE_TYPE("qualityCurrentStage", "内审阶段类型"), AUDIT_MANAGEMENT_FILE_TYPE("auditManagementFileType", "内审关联文件类型"), EXTERNAL_FILE_TYPE("externalFileType", "外审文件类型"), + CONFERENCE_RECORD_FILE_TYPE("quality_work_type", "会议记录关联文件类型"), QUALITY_EXTERNAL_AUDIT_FILE("qualityExternalAuditFile", "外审关联类型"), LAB_CODE("bizLabCode", "外审关联类型"), MANAGEMENT_REVIEW_CURRENT_STAGE("managementReviewCurrentStage", "管理评审当前阶段"), 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 dd7b309..4c1693f 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -13,9 +14,11 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.quality.QualitySelectDTO; import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.file.QualityConferenceRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityConferenceRecord; +import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,7 +28,10 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** @@ -42,10 +48,11 @@ private final IBizQualityConferenceRecordService bizQualityConferenceRecordService; private final AbstractPermissionContext permissionContext; - - public BizQualityConferenceRecordController(IBizQualityConferenceRecordService bizQualityConferenceRecordService, AbstractPermissionContext permissionContext) { + private final AbstractDictService dictService; + public BizQualityConferenceRecordController(IBizQualityConferenceRecordService bizQualityConferenceRecordService, AbstractPermissionContext permissionContext, AbstractDictService dictService) { this.bizQualityConferenceRecordService = bizQualityConferenceRecordService; this.permissionContext = permissionContext; + this.dictService = dictService; } @@ -163,13 +170,24 @@ } /** - * 关联工作查询接口-t + * 纠正措施处理单列表 + * + * @return */ - @ApiOperation("关联工作查询接口-待完善") - @GetMapping(value = "/relWork") - public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { - List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); - return ReturnUtil.success(qualitySelectDTOS); + @ApiOperation("关联工作查询") + @GetMapping(value = "/fileTypes") + public ReturnDTO> relFileList() { + List dictList = dictService.findInDictByCode(QualityDictTypeEnum.CONFERENCE_RECORD_FILE_TYPE.getCode()); + List> mapList = + dictList.stream().map(dict -> { + QualityConferenceRelFileTypeEnum typeEnum = QualityConferenceRelFileTypeEnum.typeOfCode(Integer.valueOf(dict.getCode())); + Map map = new HashMap<>(); + map.put("code", dict.getCode()); + map.put("name", dict.getName()); + typeEnum.wrapMap(map); + return map; + }).collect(Collectors.toList()); + return ReturnUtil.success(mapList); } @ApiOperation("导出word/pdf/打印") @@ -177,4 +195,4 @@ public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 } -} +} \ No newline at end of file diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityDictTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityDictTypeEnum.java index 8add8e0..aee408b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityDictTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityDictTypeEnum.java @@ -11,6 +11,7 @@ AUDIT_MANAGEMENT_STAGE_TYPE("qualityCurrentStage", "内审阶段类型"), AUDIT_MANAGEMENT_FILE_TYPE("auditManagementFileType", "内审关联文件类型"), EXTERNAL_FILE_TYPE("externalFileType", "外审文件类型"), + CONFERENCE_RECORD_FILE_TYPE("quality_work_type", "会议记录关联文件类型"), QUALITY_EXTERNAL_AUDIT_FILE("qualityExternalAuditFile", "外审关联类型"), LAB_CODE("bizLabCode", "外审关联类型"), MANAGEMENT_REVIEW_CURRENT_STAGE("managementReviewCurrentStage", "管理评审当前阶段"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityConferenceRelFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityConferenceRelFileTypeEnum.java new file mode 100644 index 0000000..2eb5c65 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityConferenceRelFileTypeEnum.java @@ -0,0 +1,79 @@ +package com.casic.missiles.enums.quality.file; + +import java.util.Map; + +/** + * @Description: 会议关联文件类型 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityConferenceRelFileTypeEnum implements IEnumType { + + INTERNAL(1, "内部审核", "zlhdnbshjcb", "/quality/internalAuditManagement/list"), + EXTERNAL(2, "外部审核", "", "/quality/externalAudit/list"), + MANAGER(3, "管理审核", "zlhdglpsbg", "/quality/managementReview/list"), + OTHER(4, "其他", "", null); + + private Integer code; + private String value; + private String url; + private String formId; + + QualityConferenceRelFileTypeEnum(Integer code, String value, String formId, String url) { + this.code = code; + this.value = value; + this.url = url; + this.formId = formId; + } + + public String getFormId() { + return formId; + } + + public void setFormId(String formId) { + this.formId = formId; + } + + public Integer getCode() { + return code; + } + + public String getValue() { + return value; + } + + + public String getUrl() { + return url; + } + + public static QualityConferenceRelFileTypeEnum typeOfCode(Integer code) { + QualityConferenceRelFileTypeEnum sourceFileTypeEnum = null; + switch (code) { + case 1: + sourceFileTypeEnum = INTERNAL; + break; + case 2: + sourceFileTypeEnum = EXTERNAL; + break; + case 3: + sourceFileTypeEnum = MANAGER; + break; + default: + sourceFileTypeEnum = OTHER; + break; + } + return sourceFileTypeEnum; + } + + @Override + public IEnumType typeByCode(Integer code) { + return QualityCorrectiveFileTypeEnum.typeOfCode(code); + } + + @Override + public void wrapMap(Map map) { + map.put("tips", this.getUrl()); + map.put("formId", this.getFormId()); + } +}