移除旧的班组判定，新增新的班组判定与班组判定配置

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java

@@ -44,6 +44,7 @@ public interface ErrorCodeConstants {
 	ErrorCode CONFIG_STANDARD_SAMPLE_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "标准样类型配置不存在");
 	ErrorCode CONFIG_STANDARD_SAMPLE_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "标准样检测项目配置不存在");
 	ErrorCode CONFIG_SUB_SAMPLE_PARENT_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样配置不存在");
+	ErrorCode CONFIG_SUB_SAMPLE_PARENT_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样与检测方法配置不存在");
 	ErrorCode CONFIG_SUB_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样与检测方法配置不存在");
 	ErrorCode CONFIG_SUB_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样配置不存在");
 	ErrorCode CONFIG_SAMPLE_REPORT_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品报表关系不存在");
@@ -99,7 +100,7 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_STANDARD_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_100_000, "标准样业务不存在");
 	ErrorCode BUSINESS_STANDARD_SAMPLE_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "标准样检测项目业务不存在");
 	
-	ErrorCode BUSINESS_TEAM_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定数据业务不存在");
+	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定数据业务不存在");
 
 	//检测报告
 	ErrorCode REPORT_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");

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

@@ -11,21 +11,21 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 
 @Schema(description = "管理后台 - 班组判定数据业务分页 Request VO")
 @Data
-public class BusinessTeamAssessmentPageReqVO extends PageParam {
+public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
 
-    @Schema(description = "样品分样ID", example = "27568")
+    @Schema(description = "样品分样ID", example = "23188")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", example = "15259")
+    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", example = "17642")
     private Long dictionaryProjectId;
 
-    @Schema(description = "检测方法分析项目配置ID", example = "10333")
+    @Schema(description = "检测方法分析项目配置ID", example = "7653")
     private Long configAssayMethodProjectId;
 
-    @Schema(description = "检测方法配置ID", example = "7558")
+    @Schema(description = "检测方法配置ID", example = "16271")
     private Long configAssayMethodId;
 
-    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
     private String dataType;
 
     @Schema(description = "小数位")
@@ -34,10 +34,10 @@ public class BusinessTeamAssessmentPageReqVO extends PageParam {
     @Schema(description = "判定值")
     private String assessmentValue;
 
-    @Schema(description = "上报对应列", example = "芋艿")
+    @Schema(description = "上报对应列", example = "张三")
     private String columnName;
 
-    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1")
+    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
     private String assessmentStatus;
 
     @Schema(description = "是否已上报")
@@ -57,7 +57,7 @@ public class BusinessTeamAssessmentPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "乐观锁", example = "7663")
+    @Schema(description = "乐观锁", example = "16999")
     private Integer updateCount;
 
     @Schema(description = "备注")

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

@@ -10,29 +10,29 @@ import com.alibaba.excel.annotation.*;
 @Schema(description = "管理后台 - 班组判定数据业务 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class BusinessTeamAssessmentRespVO {
+public class BusinessSubParentSampleAssessmentRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1643")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5014")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27568")
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23188")
     @ExcelProperty("样品分样ID")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "15259")
+    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "17642")
     @ExcelProperty("检测项目ID,字典表【T_DIC_PRJ】")
     private Long dictionaryProjectId;
 
-    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10333")
+    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7653")
     @ExcelProperty("检测方法分析项目配置ID")
     private Long configAssayMethodProjectId;
 
-    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7558")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16271")
     @ExcelProperty("检测方法配置ID")
     private Long configAssayMethodId;
 
-    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
     private String dataType;
 
@@ -44,11 +44,11 @@ public class BusinessTeamAssessmentRespVO {
     @ExcelProperty("判定值")
     private String assessmentValue;
 
-    @Schema(description = "上报对应列", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "上报对应列", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
     @ExcelProperty("上报对应列")
     private String columnName;
 
-    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差")
     private String assessmentStatus;
 
@@ -64,7 +64,7 @@ public class BusinessTeamAssessmentRespVO {
     @ExcelProperty("上报时间")
     private LocalDateTime reportTime;
 
-    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
@@ -72,7 +72,7 @@ public class BusinessTeamAssessmentRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "7663")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "16999")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 

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

@@ -9,28 +9,28 @@ import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 班组判定数据业务新增/修改 Request VO")
 @Data
-public class BusinessTeamAssessmentSaveReqVO {
+public class BusinessSubParentSampleAssessmentSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1643")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5014")
     private Long id;
 
-    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27568")
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23188")
     @NotNull(message = "样品分样ID不能为空")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "15259")
+    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "17642")
     @NotNull(message = "检测项目ID,字典表【T_DIC_PRJ】不能为空")
     private Long dictionaryProjectId;
 
-    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10333")
+    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7653")
     @NotNull(message = "检测方法分析项目配置ID不能为空")
     private Long configAssayMethodProjectId;
 
-    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7558")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16271")
     @NotNull(message = "检测方法配置ID不能为空")
     private Long configAssayMethodId;
 
-    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
     private String dataType;
 
@@ -40,11 +40,12 @@ public class BusinessTeamAssessmentSaveReqVO {
     @Schema(description = "判定值")
     private String assessmentValue;
 
-    @Schema(description = "上报对应列", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "上报对应列", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
     @NotEmpty(message = "上报对应列不能为空")
     private String columnName;
 
-    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差不能为空")
     private String assessmentStatus;
 
     @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -59,10 +60,11 @@ public class BusinessTeamAssessmentSaveReqVO {
     @NotNull(message = "上报时间不能为空")
     private LocalDateTime reportTime;
 
-    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "7663")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "16999")
+    @NotNull(message = "乐观锁不能为空")
     private Integer updateCount;
 
     @Schema(description = "备注")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubParentSampleAssessmentDO.java

@@ -12,8 +12,8 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 *
 * @author 后台管理
 */
-@TableName("t_bsn_tam_asmt")
+@TableName("t_bsn_sb_prn_smp_asmt")
-@KeySequence("t_bsn_tam_asmt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@KeySequence("t_bsn_sb_prn_smp_asmt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -23,7 +23,7 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 /**
 * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
 */
-public class BusinessTeamAssessmentDO extends BusinessBaseDO {
+public class BusinessSubParentSampleAssessmentDO extends BusinessBaseDO {
 
 
 
@@ -63,7 +63,7 @@ public class BusinessTeamAssessmentDO extends BusinessBaseDO {
     @TableField("DEC_POS")
     private Integer decimalPosition;
     /**
-    * 判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差
+    * 判定值
     */
     @TableField("ASMT_VAL")
     private String assessmentValue;
@@ -73,7 +73,7 @@ public class BusinessTeamAssessmentDO extends BusinessBaseDO {
     @TableField("COLN_NAME")
     private String columnName;
     /**
-    * 超差标注
+    * 判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差
     */
     @TableField("ASMT_STS")
     private String assessmentStatus;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentMapper.java

@@ -0,0 +1,41 @@
+package com.zt.plat.module.qms.business.bus.dal.mapper;
+
+import java.util.*;
+
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
+import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 班组判定数据业务 Mapper
+ *
+ * @author 后台管理
+ */
+@Mapper
+public interface BusinessSubParentSampleAssessmentMapper extends BaseMapperX<BusinessSubParentSampleAssessmentDO> {
+
+    default PageResult<BusinessSubParentSampleAssessmentDO> selectPage(BusinessSubParentSampleAssessmentPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<BusinessSubParentSampleAssessmentDO>()
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getDecimalPosition, reqVO.getDecimalPosition())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getAssessmentValue, reqVO.getAssessmentValue())
+                .likeIfPresent(BusinessSubParentSampleAssessmentDO::getColumnName, reqVO.getColumnName())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getAssessmentStatus, reqVO.getAssessmentStatus())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getIsReported, reqVO.getIsReported())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getReporter, reqVO.getReporter())
+                .betweenIfPresent(BusinessSubParentSampleAssessmentDO::getReportTime, reqVO.getReportTime())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessSubParentSampleAssessmentDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getRemark, reqVO.getRemark())
+                .orderByDesc(BusinessSubParentSampleAssessmentDO::getId));
+    }
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessTeamAssessmentMapper.java

@@ -1,40 +0,0 @@
-package com.zt.plat.module.qms.business.bus.dal.mapper;
-
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessTeamAssessmentPageReqVO;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessTeamAssessmentDO;
-import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 班组判定数据业务 Mapper
- *
- * @author 后台管理
- */
-@Mapper
-public interface BusinessTeamAssessmentMapper extends BaseMapperX<BusinessTeamAssessmentDO> {
-
-    default PageResult<BusinessTeamAssessmentDO> selectPage(BusinessTeamAssessmentPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<BusinessTeamAssessmentDO>()
-                .eqIfPresent(BusinessTeamAssessmentDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
-                .eqIfPresent(BusinessTeamAssessmentDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
-                .eqIfPresent(BusinessTeamAssessmentDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
-                .eqIfPresent(BusinessTeamAssessmentDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
-                .eqIfPresent(BusinessTeamAssessmentDO::getDataType, reqVO.getDataType())
-                .eqIfPresent(BusinessTeamAssessmentDO::getDecimalPosition, reqVO.getDecimalPosition())
-                .eqIfPresent(BusinessTeamAssessmentDO::getAssessmentValue, reqVO.getAssessmentValue())
-                .likeIfPresent(BusinessTeamAssessmentDO::getColumnName, reqVO.getColumnName())
-                .eqIfPresent(BusinessTeamAssessmentDO::getAssessmentStatus, reqVO.getAssessmentStatus())
-                .eqIfPresent(BusinessTeamAssessmentDO::getIsReported, reqVO.getIsReported())
-                .eqIfPresent(BusinessTeamAssessmentDO::getReporter, reqVO.getReporter())
-                .betweenIfPresent(BusinessTeamAssessmentDO::getReportTime, reqVO.getReportTime())
-                .eqIfPresent(BusinessTeamAssessmentDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
-                .betweenIfPresent(BusinessTeamAssessmentDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(BusinessTeamAssessmentDO::getUpdateCount, reqVO.getUpdateCount())
-                .eqIfPresent(BusinessTeamAssessmentDO::getRemark, reqVO.getRemark())
-                .orderByDesc(BusinessTeamAssessmentDO::getId));
-    }
-
-}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustCheckCmp.java

@@ -7,6 +7,7 @@ import com.zt.plat.framework.common.exception.ServiceException;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleEntrustRegistrationDO;
 import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleEntrustContext;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigEntrustSourceDO;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
 
 /**
  * 样品委托检查
@@ -30,7 +31,7 @@ public class SampleEntrustCheckCmp extends NodeComponent {
 			throw new ServiceException(500, "委托来源id不正确");
 		}
 		
-		sampleEntrustRegistration.setDataCheckStatus("success");
+		sampleEntrustRegistration.setDataCheckStatus(QmsCommonConstant.SUCCESS);
 
 	}