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

This commit is contained in:
2025-10-21 10:03:36 +08:00
parent bdd5636a47
commit 62d76557fd
24 changed files with 777 additions and 300 deletions

View File

@@ -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 = "备注")

View File

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

View File

@@ -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 = "备注")

View File

@@ -12,8 +12,8 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
*
* @author 后台管理
*/
@TableName("t_bsn_tam_asmt")
@KeySequence("t_bsn_tam_asmt_seq") // 用于 OraclePostgreSQLKingbaseDB2H2 数据库的主键自增如果是 MySQL 等数据库可不写
@TableName("t_bsn_sb_prn_smp_asmt")
@KeySequence("t_bsn_sb_prn_smp_asmt_seq") // 用于 OraclePostgreSQLKingbaseDB2H2 数据库的主键自增如果是 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;

View File

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

View File

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

View File

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

View File

@@ -1,14 +1,10 @@
package com.zt.plat.module.qms.business.bus.service;
import java.util.*;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessTeamAssessmentPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessTeamAssessmentRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessTeamAssessmentSaveReqVO;
import jakarta.validation.*;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessTeamAssessmentDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
import com.zt.plat.framework.common.pojo.PageParam;
/**
@@ -16,7 +12,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
*
* @author 后台管理
*/
public interface BusinessTeamAssessmentService {
public interface BusinessSubParentSampleAssessmentService {
/**
* 创建班组判定数据业务
@@ -24,28 +20,28 @@ public interface BusinessTeamAssessmentService {
* @param createReqVO 创建信息
* @return 编号
*/
BusinessTeamAssessmentRespVO createBusinessTeamAssessment(@Valid BusinessTeamAssessmentSaveReqVO createReqVO);
BusinessSubParentSampleAssessmentRespVO createBusinessSubParentSampleAssessment(@Valid BusinessSubParentSampleAssessmentSaveReqVO createReqVO);
/**
* 更新班组判定数据业务
*
* @param updateReqVO 更新信息
*/
void updateBusinessTeamAssessment(@Valid BusinessTeamAssessmentSaveReqVO updateReqVO);
void updateBusinessSubParentSampleAssessment(@Valid BusinessSubParentSampleAssessmentSaveReqVO updateReqVO);
/**
* 删除班组判定数据业务
*
* @param id 编号
*/
void deleteBusinessTeamAssessment(Long id);
void deleteBusinessSubParentSampleAssessment(Long id);
/**
* 批量删除班组判定数据业务
*
* @param ids 编号
*/
void deleteBusinessTeamAssessmentListByIds(List<Long> ids);
void deleteBusinessSubParentSampleAssessmentListByIds(List<Long> ids);
/**
* 获得班组判定数据业务
@@ -53,7 +49,7 @@ public interface BusinessTeamAssessmentService {
* @param id 编号
* @return 班组判定数据业务
*/
BusinessTeamAssessmentDO getBusinessTeamAssessment(Long id);
BusinessSubParentSampleAssessmentDO getBusinessSubParentSampleAssessment(Long id);
/**
* 获得班组判定数据业务分页
@@ -61,6 +57,6 @@ public interface BusinessTeamAssessmentService {
* @param pageReqVO 分页查询
* @return 班组判定数据业务分页
*/
PageResult<BusinessTeamAssessmentDO> getBusinessTeamAssessmentPage(BusinessTeamAssessmentPageReqVO pageReqVO);
PageResult<BusinessSubParentSampleAssessmentDO> getBusinessSubParentSampleAssessmentPage(BusinessSubParentSampleAssessmentPageReqVO pageReqVO);
}

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