zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
FCL
2025-11-04 18:05:20 +08:00
parent 536f971e8e 56807cfdcf
commit b3e11fe92e
17 changed files with 192 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCDataController.java
View File

@@ -67,7 +67,7 @@ public class BusinessQCDataController implements BusinessControllerMarker {
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除质控样业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-data:delete')")
@PreAuthorize("@ss.hasPermission('qms:business-QC-data:delete')")
public CommonResult<Boolean> deleteBusinessQCDataList(@RequestBody BatchDeleteReqVO req) {
businessQCDataService.deleteBusinessQCDataListByIds(req.getIds());
return success(true);

9
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java
View File

@@ -1,8 +1,5 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSamplePageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -91,6 +88,12 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
PageResult<BusinessStandardSampleDO> pageResult = businessStandardSampleService.getBusinessStandardSamplePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessStandardSampleRespVO.class));
}
@GetMapping("/getBusinessStandardSampleByConfigQCSampleMethodId")
public CommonResult<?> getBusinessStandardSampleByConfigQCSampleMethodId(@RequestParam("configQCSampleMethodId") Long configQCSampleMethodId) {
List<BusinessStandardSampleExtendRespVO> list = businessStandardSampleService.getBusinessStandardSampleByConfigQCSampleMethodId(configQCSampleMethodId);
return success(list);
}
@GetMapping("/export-excel")
@Operation(summary = "导出标准样业务 Excel")

26
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleExtendRespVO.java Normal file
View File

@@ -0,0 +1,26 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.util.List;
import java.util.stream.Collectors;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessStandardSampleProjectDO;
import cn.hutool.core.collection.CollUtil;
import lombok.Data;
@Data
public class BusinessStandardSampleExtendRespVO extends BusinessStandardSampleRespVO {
private Long configQCSampleMethodId;
private String standardSampleProjects;
public String getStandardSampleProjects() {
if (CollUtil.isNotEmpty(this.standardSampleProjectList)) {
return this.standardSampleProjectList.stream().map(m -> m.getDictionaryProjectName() + "(" + m.getDictionaryProjectUnit() + "):" + m.getStandardValue()).collect(Collectors.joining(","));
}
return null;
}
private List<BusinessStandardSampleProjectDO> standardSampleProjectList;
}

17
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSamplePageReqVO.java
View File

@@ -9,18 +9,21 @@ import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 标准样业务分页 Request VO")
@Schema(description = "管理后台 - 定值样业务分页 Request VO")
@Data
public class BusinessStandardSamplePageReqVO extends PageParam {
@Schema(description = "标准样类型ID", example = "12799")
private Long configStandardSampleTypeId;
@Schema(description = "ID路径")
private String idPath;
@Schema(description = "标准样类型名称", example = "李四")
private String configStandardSampleTypeName;
@Schema(description = "上级ID", example = "9719")
private Long parentId;
@Schema(description = "标准样编号")
private String standardSampleCode;
@Schema(description = "名称,一级：管理样、标准样、标样；二级：具体定值样", example = "赵六")
private String name;
@Schema(description = "编号")
private String code;
@Schema(description = "是否启用,1-启用，0-不启用")
private Integer isUse;

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectPageReqVO.java
View File

@@ -9,17 +9,17 @@ import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 标准样检测项目业务分页 Request VO")
@Schema(description = "管理后台 - 定值样检测项目业务分页 Request VO")
@Data
public class BusinessStandardSampleProjectPageReqVO extends PageParam {
@Schema(description = "标准样ID", example = "10572")
@Schema(description = "定值样ID", example = "17499")
private Long businessStandardSampleId;
@Schema(description = "标准样元素配置ID", example = "17543")
@Schema(description = "定值样元素配置ID", example = "10892")
private Long configStandardSampleProjectId;
@Schema(description = "检测项目ID", example = "19425")
@Schema(description = "检测项目ID", example = "7881")
private Long dictionaryProjectId;
@Schema(description = "检测项目名称", example = "张三")

16
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectRespVO.java
View File

@@ -7,24 +7,24 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 标准样检测项目业务 Response VO")
@Schema(description = "管理后台 - 定值样检测项目业务 Response VO")
@Data
@ExcelIgnoreUnannotated
public class BusinessStandardSampleProjectRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8746")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30840")
@ExcelProperty("ID")
private Long id;
@Schema(description = "标准样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10572")
@ExcelProperty("标准样ID")
@Schema(description = "定值样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17499")
@ExcelProperty("定值样ID")
private Long businessStandardSampleId;
@Schema(description = "标准样元素配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17543")
@ExcelProperty("标准样元素配置ID")
@Schema(description = "定值样元素配置ID", example = "10892")
@ExcelProperty("定值样元素配置ID")
private Long configStandardSampleProjectId;
@Schema(description = "检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19425")
@Schema(description = "检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7881")
@ExcelProperty("检测项目ID")
private Long dictionaryProjectId;
@@ -52,7 +52,7 @@ public class BusinessStandardSampleProjectRespVO {
@ExcelProperty("排序号")
private Integer sortNo;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "所属部门")
@ExcelProperty("所属部门")
private String systemDepartmentCode;

15
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectSaveReqVO.java
View File

@@ -5,22 +5,21 @@ import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 标准样检测项目业务新增/修改 Request VO")
@Schema(description = "管理后台 - 定值样检测项目业务新增/修改 Request VO")
@Data
public class BusinessStandardSampleProjectSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8746")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30840")
private Long id;
@Schema(description = "标准样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10572")
@NotNull(message = "标准样ID不能为空")
@Schema(description = "定值样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17499")
@NotNull(message = "定值样ID不能为空")
private Long businessStandardSampleId;
@Schema(description = "标准样元素配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17543")
@NotNull(message = "标准样元素配置ID不能为空")
@Schema(description = "定值样元素配置ID", example = "10892")
private Long configStandardSampleProjectId;
@Schema(description = "检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19425")
@Schema(description = "检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7881")
@NotNull(message = "检测项目ID不能为空")
private Long dictionaryProjectId;
@@ -44,7 +43,7 @@ public class BusinessStandardSampleProjectSaveReqVO {
@Schema(description = "排序号")
private Integer sortNo;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "备注")

44
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleReqVO.java Normal file
View File

@@ -0,0 +1,44 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 定值样业务分页 Request VO")
@Data
public class BusinessStandardSampleReqVO {
@Schema(description = "ID路径")
private String idPath;
@Schema(description = "上级ID", example = "9719")
private Long parentId;
@Schema(description = "名称,一级：管理样、标准样、标样；二级：具体定值样", example = "赵六")
private String name;
@Schema(description = "编号")
private String code;
@Schema(description = "是否启用,1-启用，0-不启用")
private Integer isUse;
@Schema(description = "是否发布,1-是，0-否")
private Integer isPublish;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "备注")
private String remark;
}

28
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleRespVO.java
View File

@@ -7,26 +7,30 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 标准样业务 Response VO")
@Schema(description = "管理后台 - 定值样业务 Response VO")
@Data
@ExcelIgnoreUnannotated
public class BusinessStandardSampleRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28533")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22309")
@ExcelProperty("ID")
private Long id;
@Schema(description = "标准样类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12799")
@ExcelProperty("标准样类型ID")
private Long configStandardSampleTypeId;
@Schema(description = "ID路径")
@ExcelProperty("ID路径")
private String idPath;
@Schema(description = "标准样类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
@ExcelProperty("标准样类型名称")
private String configStandardSampleTypeName;
@Schema(description = "上级ID", example = "9719")
@ExcelProperty("上级ID")
private Long parentId;
@Schema(description = "标准样编号", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("标准样编号")
private String standardSampleCode;
@Schema(description = "名称,一级：管理样、标准样、标样；二级：具体定值样", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@ExcelProperty("名称,一级：管理样、标准样、标样；二级：具体定值样")
private String name;
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("编号")
private String code;
@Schema(description = "是否启用,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否启用,1-启用，0-不启用")
@@ -36,7 +40,7 @@ public class BusinessStandardSampleRespVO {
@ExcelProperty("是否发布,1-是，0-否")
private Integer isPublish;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "所属部门")
@ExcelProperty("所属部门")
private String systemDepartmentCode;

26
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleSaveReqVO.java
View File

@@ -5,24 +5,26 @@ import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 标准样业务新增/修改 Request VO")
@Schema(description = "管理后台 - 定值样业务新增/修改 Request VO")
@Data
public class BusinessStandardSampleSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28533")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22309")
private Long id;
@Schema(description = "标准样类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12799")
@NotNull(message = "标准样类型ID不能为空")
private Long configStandardSampleTypeId;
@Schema(description = "ID路径")
private String idPath;
@Schema(description = "标准样类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
@NotEmpty(message = "标准样类型名称不能为空")
private String configStandardSampleTypeName;
@Schema(description = "上级ID", example = "9719")
private Long parentId;
@Schema(description = "标准样编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "标准样编号不能为空")
private String standardSampleCode;
@Schema(description = "名称,一级：管理样、标准样、标样；二级：具体定值样", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@NotEmpty(message = "名称,一级：管理样、标准样、标样；二级：具体定值样不能为空")
private String name;
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "编号不能为空")
private String code;
@Schema(description = "是否启用,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "是否启用,1-启用，0-不启用不能为空")
@@ -32,7 +34,7 @@ public class BusinessStandardSampleSaveReqVO {
@NotNull(message = "是否发布,1-是，0-否不能为空")
private Integer isPublish;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "备注")

Some files were not shown because too many files have changed in this diff Show More