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

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

@@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;
@@ -93,6 +92,28 @@ public class BusinessSampleEntrustUnStandardProjectController implements Busines
         return success(BeanUtils.toBean(pageResult, BusinessSampleEntrustUnStandardProjectRespVO.class));
     }
     
+    @GetMapping("/list")
+    @Operation(summary = "获得委检登记样品检测项目表(无标准)列表")
+    public CommonResult<List<BusinessSampleEntrustUnStandardProjectExtendRespVO>> getBusinessSampleEntrustUnStandardProjectList(BusinessSampleEntrustUnStandardProjectPageReqVO reqVO) {
+    	List<BusinessSampleEntrustUnStandardProjectExtendRespVO> list = businessSampleEntrustUnStandardProjectService.getBusinessSampleEntrustUnStandardProjectList(reqVO);
+    	return success(list);
+    }
+
+    @GetMapping("/listByBusinessBaseSampleId")
+    @Operation(summary = "获得委检登记样品检测项目表(无标准)分页")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-un-standard-project:query')")
+    public CommonResult<List<BusinessSampleEntrustUnStandardProjectExtendRespVO>> listByBusinessBaseSampleId(@RequestParam("businessBaseSampleId") Long businessBaseSampleId) {
+        List<BusinessSampleEntrustUnStandardProjectExtendRespVO> listResult = businessSampleEntrustUnStandardProjectService.listByBusinessBaseSampleId(businessBaseSampleId);
+        return success(listResult);
+    }
+    
+    @PostMapping("/saveAssayDept")
+    @Operation(summary = "保存指派的分析部门")
+    public CommonResult<?> saveAssayDept(@RequestBody BusinessSampleEntrustUnStandardProjectAssayDeptSaveReqVO reqVO) {
+    	businessSampleEntrustUnStandardProjectService.saveAssayDept(reqVO);
+    	return success("成功");
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出委检登记样品检测项目表(无标准) Excel")
     //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-un-standard-project:export')")

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

@@ -22,6 +22,8 @@ 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.SampleTaskAssignProjectMethodParam;
+import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignProjectNoMethodParam;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignSampleParam;
 import com.zt.plat.module.qms.business.bus.service.SampleTaskAssignService;
 import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
@@ -117,6 +119,28 @@ public class SampleTaskAssignController implements BusinessControllerMarker {
     	return success("成功");
     }
 
+    /**
+     * 按检测项目分配(已有方法)
+     * @param param
+     * @return
+     */
+    @PostMapping("/projectMethodAssign")
+    public CommonResult<?> projectMethodAssign(@RequestBody SampleTaskAssignProjectMethodParam param) {
+    	sampleTaskAssignService.projectMethodAssign(param);
+    	return success("成功");
+	}
+    
+    /**
+     * 按检测项目分配（无方法）
+     * @param param
+     * @return
+     */
+    @PostMapping("/projectNoMethodAssign")
+    public CommonResult<?> projectNoMethodAssign(@RequestBody SampleTaskAssignProjectNoMethodParam param) {
+    	sampleTaskAssignService.projectNoMethodAssign(param);
+    	return success("成功");
+	}
+	
     /**
      * 按样品分配
      * @param param

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

@@ -106,6 +106,9 @@ public class BusinessSampleEntrustRegistrationPageReqVO extends PageParam {
     @Schema(description = "检测方法,【字典】【jy_sample_entrust_assay_method】国标、行标、客户要求、检测方依据样品选择")
     private String assayMethod;
 
+    @Schema(description = "是否物料检测标准登记,0-否，1-是")
+    private Integer isMaterialAssayStandard;
+
     @Schema(description = "登记状态,in_progress-登记中、submit-已提交", example = "1")
     private String registrationStatus;
 

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

@@ -137,6 +137,9 @@ public class BusinessSampleEntrustRegistrationRespVO {
     @ExcelProperty("检测方法,【字典】【jy_sample_entrust_assay_method】国标、行标、客户要求、检测方依据样品选择")
     private String assayMethod;
 
+    @Schema(description = "是否物料检测标准登记,0-否，1-是")
+    private Integer isMaterialAssayStandard;
+
     @Schema(description = "登记状态,in_progress-登记中、submit-已提交", example = "1")
     @ExcelProperty("登记状态,in_progress-登记中、submit-已提交")
     private String registrationStatus;

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

@@ -118,6 +118,9 @@ public class BusinessSampleEntrustRegistrationSaveReqVO {
     @NotEmpty(message = "检测方法,【字典】【jy_sample_entrust_assay_method】国标、行标、客户要求、检测方依据样品选择不能为空")
     private String assayMethod;
 
+    @Schema(description = "是否物料检测标准登记,0-否，1-是")
+    private Integer isMaterialAssayStandard;
+
     @Schema(description = "登记状态,in_progress-登记中、submit-已提交", example = "1")
     private String registrationStatus;
 

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

@@ -0,0 +1,14 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class BusinessSampleEntrustUnStandardProjectAssayDeptSaveReqVO {
+
+	private BusinessSubSampleSaveReqVO subSampleReqVO;
+	
+	private List<BusinessSampleEntrustUnStandardProjectSaveReqVO> reqList;
+}

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

@@ -0,0 +1,46 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.time.LocalDateTime;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * <b>BusinessSampleEntrustUnStandardProjectExtendRespVO</b>
+ */
+@Data
+public class BusinessSampleEntrustUnStandardProjectExtendRespVO extends BusinessSampleEntrustUnStandardProjectRespVO {
+
+	@Schema(description = "检验委托登记ID")
+    private Long businessSampleEntrustRegistrationId;
+
+	@Schema(description = "主样业务ID")
+    private Long businessBaseSampleId;
+	
+    @Schema(description = "子样配置id")
+    private Long configSubSampleId;
+
+    @Schema(description = "样品名称")
+    private String sampleName;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+
+    @Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String sampleFlowNodeKey;
+
+    @Schema(description = "样品流程节点时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime sampleFlowNodeTime;
+    
+    @Schema(description = "检测项名称")
+    private String dictionaryProjectName;
+
+    @Schema(description = "检测项简称")
+    private String dictionaryProjectSimpleName;
+
+    @Schema(description = "检测项显示名")
+    private String dictionaryProjectShowName;
+}

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

@@ -22,6 +22,9 @@ public class BusinessSampleEntrustUnStandardProjectPageReqVO extends PageParam {
     @Schema(description = "分析部门名称", example = "赵六")
     private String assayDepartmentName;
 
+    @Schema(description = "分样子样ID", example = "30545")
+    private Long businessSubSampleId;
+
     @Schema(description = "检测任务ID", example = "978")
     private Long businessAssayTaskDataId;
 
@@ -37,6 +40,9 @@ public class BusinessSampleEntrustUnStandardProjectPageReqVO extends PageParam {
     @Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", example = "17192")
     private Long dictionaryProjectId;
 
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
     @Schema(description = "是否启用,1-启用，0-不启用")
     private Integer isEnabled;
 
@@ -53,4 +59,31 @@ public class BusinessSampleEntrustUnStandardProjectPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    //=======扩展字段
+
+    @Schema(description = "样品流程节点时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleFlowNodeTime;
+    
+    @Schema(description = "检测项目字典id列表")
+    private List<Long> dictionaryProjectIdList;
+
+    @Schema(description = "收样时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleReceiveTime;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+    
+    @Schema(description = "样品名称")
+    private String sampleName;
+
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+
+    @Schema(description = "归库编号")
+    private String sampleReturnCode;
+
+    @Schema(description = "样品状态")
+    private String sampleStatus;
 }

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

@@ -28,6 +28,9 @@ public class BusinessSampleEntrustUnStandardProjectRespVO {
     @ExcelProperty("分析部门名称")
     private String assayDepartmentName;
 
+    @Schema(description = "分样子样ID", example = "30545")
+    private Long businessSubSampleId;
+
     @Schema(description = "检测任务ID", example = "978")
     @ExcelProperty("检测任务ID")
     private Long businessAssayTaskDataId;
@@ -48,6 +51,10 @@ public class BusinessSampleEntrustUnStandardProjectRespVO {
     @ExcelProperty("检测项目ID,字典表：【T_DIC_PRJ】")
     private Long dictionaryProjectId;
 
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    @ExcelProperty("用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
     @Schema(description = "是否启用,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("是否启用,1-启用，0-不启用")
     private Integer isEnabled;

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

@@ -22,6 +22,9 @@ public class BusinessSampleEntrustUnStandardProjectSaveReqVO {
     @Schema(description = "分析部门名称", example = "赵六")
     private String assayDepartmentName;
 
+    @Schema(description = "分样子样ID", example = "30545")
+    private Long businessSubSampleId;
+
     @Schema(description = "检测任务ID", example = "978")
     private Long businessAssayTaskDataId;
 
@@ -38,8 +41,10 @@ public class BusinessSampleEntrustUnStandardProjectSaveReqVO {
     @NotNull(message = "检测项目ID,字典表：【T_DIC_PRJ】不能为空")
     private Long dictionaryProjectId;
 
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
     @Schema(description = "是否启用,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否启用,1-启用，0-不启用不能为空")
     private Integer isEnabled;
 
     @Schema(description = "所属部门")