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

任务分配等修改

Browse Source
This commit is contained in:
王兴荣
2026-02-23 13:42:13 +08:00
parent fdd3657ba9
commit 0851f33efd
32 changed files with 634 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,6 +99,18 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
return success(list);
}
@GetMapping("/getUnAssayTaskGroupTypeList")
@Operation(summary = "获得未指派的子样检测任务业务分组列表")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
public CommonResult<?> getUnAssayTaskGroupTypeList(BusinessAssayTaskDataReqVO reqVO) {
if (reqVO.getAssayDepartmentId() == null) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
}
List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAssayTaskGroupTypeList(reqVO);
return success(list);
}
@GetMapping("/getUnAuditTaskGroupList")
@Operation(summary = "获得未审核的子样检测任务业务分组列表")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")

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

@@ -20,6 +20,7 @@ import com.zt.plat.framework.security.core.LoginUser;
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignManualParam;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignManualTypeParam;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignMethodParam;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignSampleParam;
import com.zt.plat.module.qms.business.bus.service.SampleTaskAssignService;
@@ -83,18 +84,44 @@ public class SampleTaskAssignController implements BusinessControllerMarker {
return success("成功");
}
/**
* 按方法分配
* @param param
* @return
*/
@PostMapping("/methodAssign")
public CommonResult<?> methodAssign(@RequestBody SampleTaskAssignMethodParam param) {
sampleTaskAssignService.methodAssign(param);
return success("成功");
}
/**
* 手动分配
* @param param
* @return
*/
@PostMapping("/manualAssign")
public CommonResult<?> manualAssign(@RequestBody SampleTaskAssignManualParam param) {
sampleTaskAssignService.manualAssign(param);
return success("成功");
}
/**
* 手动类型分配
* @param param
* @return
*/
@PostMapping("/manualTypeAssign")
public CommonResult<?> manualTypeAssign(@RequestBody SampleTaskAssignManualTypeParam param) {
sampleTaskAssignService.manualTypeAssign(param);
return success("成功");
}
/**
* 按样品分配
* @param param
* @return
*/
@PostMapping("/sampleAssign")
public CommonResult<?> sampleAssign(@RequestBody SampleTaskAssignSampleParam param) {
sampleTaskAssignService.sampleAssign(param);

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

@@ -11,8 +11,12 @@ public class BusinessAssayTaskDataGroupRespVO {
/** 方法名称 **/
private String configAssayMethodName;
private String configAssayMethodDictionaryBusinessId;
private String configAssayMethodDictionaryBusinessKey;
private String configAssayMethodDictionaryBusinessName;
/** 方法名称及类别 **/
private String configAssayMethodNameAndCategory;

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

@@ -108,4 +108,10 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
@Schema(description = "样品状态")
private String sampleStatus;
private Long configAssayMethodDictionaryBusinessId;
private String configAssayMethodDictionaryBusinessKey;
private String configAssayMethodDictionaryBusinessName;
}

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

@@ -109,6 +109,12 @@ public class BusinessAssayTaskDataReqVO {
@Schema(description = "样品状态")
private String sampleStatus;
private Long configAssayMethodDictionaryBusinessId;
private String configAssayMethodDictionaryBusinessKey;
private String configAssayMethodDictionaryBusinessName;
@Schema(description = "检测方法配置名称")
private String configAssayMethodName;

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

@@ -25,11 +25,16 @@ public class BusinessAssayTaskExtendRespVO extends BusinessAssayTaskRespVO {
/** 任务单数据类型,横向：horizontal，纵向：‌vertical **/
private String reportDataType;
/** 分析方法名称 **/
private String configAssayMethodName;
// /** 分析方法名称 **/
// private String configAssayMethodName;
//
// @Schema(description = "检测方法配置名称及类别")
// private String configAssayMethodNameAndCategory;
@Schema(description = "检测方法配置名称及类别")
private String configAssayMethodNameAndCategory;
private String configAssayMethodNames;
@Schema(description = "方法类别名称")
private String dictionaryBusinessName;
/** 分析方法对应的分析项目 **/
private String configAssayMethodProjectShowNames;

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

@@ -19,8 +19,14 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
@Schema(description = "指派单名称", example = "张三")
private String taskName;
@Schema(description = "检测方法配置ID", example = "13609")
private Long configAssayMethodId;
@Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102")
private Long dictionaryBusinessId;
@Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等")
private String dictionaryBusinessKey;
// @Schema(description = "检测方法配置ID", example = "13609")
// private Long configAssayMethodId;
@Schema(description = "任务单模板ID", example = "4389")
private Long configReportTemplateId;
@@ -127,10 +133,13 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
//=========扩展字段==========
/** 分析方法名称 **/
@Schema(description = "分析方法")
private String configAssayMethodName;
// /** 分析方法名称 **/
// @Schema(description = "分析方法")
// private String configAssayMethodName;
//
// @Schema(description = "检测方法配置名称及类别")
// private String configAssayMethodNameAndCategory;
@Schema(description = "检测方法配置名称及类别")
private String configAssayMethodNameAndCategory;
@Schema(description = "方法类别名称")
private String dictionaryBusinessName;
}

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

@@ -18,8 +18,14 @@ public class BusinessAssayTaskReqVO {
@Schema(description = "指派单名称", example = "张三")
private String taskName;
@Schema(description = "检测方法配置ID", example = "13609")
private Long configAssayMethodId;
@Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102")
private Long dictionaryBusinessId;
@Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等")
private String dictionaryBusinessKey;
// @Schema(description = "检测方法配置ID", example = "13609")
// private Long configAssayMethodId;
@Schema(description = "任务单模板ID", example = "4389")
private Long configReportTemplateId;

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

@@ -23,9 +23,15 @@ public class BusinessAssayTaskRespVO {
@ExcelProperty("指派单名称")
private String taskName;
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13609")
@ExcelProperty("检测方法配置ID")
private Long configAssayMethodId;
@Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102")
private Long dictionaryBusinessId;
@Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等")
private String dictionaryBusinessKey;
// @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13609")
// @ExcelProperty("检测方法配置ID")
// private Long configAssayMethodId;
@Schema(description = "任务单模板ID", example = "4389")
@ExcelProperty("任务单模板ID")

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

@@ -25,9 +25,14 @@ public class BusinessAssayTaskSaveReqVO {
@NotEmpty(message = "指派单名称不能为空")
private String taskName;
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13609")
@NotNull(message = "检测方法配置ID不能为空")
private Long configAssayMethodId;
@Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102")
private Long dictionaryBusinessId;
@Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等")
private String dictionaryBusinessKey;
// @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13609")
// private Long configAssayMethodId;
@Schema(description = "任务单模板ID", example = "4389")
private Long configReportTemplateId;

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