Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

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

@@ -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')")

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

@@ -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);

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

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

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

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

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

@@ -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;
     

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

@@ -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 configAssayMethodNames;
-	private String configAssayMethodNameAndCategory;
+    
+    @Schema(description = "方法类别名称")
+    private String dictionaryBusinessName;
     
     /** 分析方法对应的分析项目 **/
     private String configAssayMethodProjectShowNames;

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

@@ -19,8 +19,14 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "指派单名称", example = "张三")
     private String taskName;
 
-    @Schema(description = "检测方法配置ID", example = "13609")
+    @Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102")
-    private Long configAssayMethodId;
+    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 = "分析方法")
+//    @Schema(description = "分析方法")
-    private String configAssayMethodName;
+//    private String configAssayMethodName;
+//    
+//    @Schema(description = "检测方法配置名称及类别")
+//	private String configAssayMethodNameAndCategory;
     
-    @Schema(description = "检测方法配置名称及类别")
+    @Schema(description = "方法类别名称")
-	private String configAssayMethodNameAndCategory;
+    private String dictionaryBusinessName;
 }

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

@@ -18,8 +18,14 @@ public class BusinessAssayTaskReqVO {
     @Schema(description = "指派单名称", example = "张三")
     private String taskName;
 
-    @Schema(description = "检测方法配置ID", example = "13609")
+    @Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102")
-    private Long configAssayMethodId;
+    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;

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

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

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

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