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

西南铜检验委托临时样品

Browse Source
This commit is contained in:
王兴荣
2026-04-02 16:09:52 +08:00
parent 9887c99571
commit ea62776bfd
24 changed files with 782 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/mq/SampleEntrustRegistrationAssayCompleteMessage.java Normal file
View File

@@ -0,0 +1,45 @@
package com.zt.plat.module.qms.mq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* <b>SampleEntrustRegistrationAssayCompleteMessage</b>
* 样品委托登记分析完成消息
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SampleEntrustRegistrationAssayCompleteMessage {
/** 统一回调主题 */
public static final String TOPIC = "SAMPLE_ENTRUST_REG_ASSAY_COMPLETE";
/**
* 委托登记id
*/
private Long businessSampleEntrustRegistrationId;
/**
* 委托来源Id
*/
private Long configEntrustSourceId;
/**
* 委托来源
*/
private String configEntrustSourceName;
/**
* 委托单号
*/
private String entrustNumber;
/**
* 委托单号
*/
private String entrustUnit;
}

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

@@ -14,6 +14,9 @@ public class BusinessSampleEntrustRegistrationExtendRespVO extends BusinessSampl
@ExcelProperty("委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托")
private String configEntrustSourceName;
@Schema(description = "委托来源key")
private String configEntrustSourceKey;
@Schema(description = "样品称重数量")
@ExcelProperty("样品称重数量")
private Integer sampleWeighingCount;

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

@@ -37,6 +37,9 @@ public class BusinessSampleEntrustUnStandardProjectPageReqVO extends PageParam {
@Schema(description = "任务数", example = "15264")
private Integer taskCount;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", example = "17192")
private Long dictionaryProjectId;

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

@@ -47,6 +47,9 @@ public class BusinessSampleEntrustUnStandardProjectRespVO {
@ExcelProperty("任务数")
private Integer taskCount;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "17192")
@ExcelProperty("检测项目ID,字典表：【T_DIC_PRJ】")
private Long dictionaryProjectId;

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

@@ -37,6 +37,9 @@ public class BusinessSampleEntrustUnStandardProjectSaveReqVO {
@Schema(description = "任务数", example = "15264")
private Integer taskCount;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "17192")
@NotNull(message = "检测项目ID,字典表：【T_DIC_PRJ】不能为空")
private Long dictionaryProjectId;

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

@@ -18,6 +18,12 @@ import lombok.Data;
public class SampleProjectResultPageReqVO extends PageParam {
private static final long serialVersionUID = 7153959501553288866L;
@Schema(description = "检验委托登记ID", example = "17352")
private Long businessSampleEntrustRegistrationId;
@Schema(description = "主样业务ID", example = "9560")
private Long businessBaseSampleId;
@Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2493")
private Long assayDepartmentId;

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSampleEntrustUnStandardProjectDO.java
View File

@@ -72,6 +72,11 @@ public class BusinessSampleEntrustUnStandardProjectDO extends BusinessBaseDO {
@TableField("TSK_CNT")
private Integer taskCount;
/**
* 是否已分配任务
*/
@TableField("IS_ASN_TSKD")
private Integer isAssignTasked;
/**
* 检测项目ID,字典表：【T_DIC_PRJ】
*/
@TableField("DIC_PRJ_ID")

11
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustRegistrationMapper.java
View File

@@ -28,6 +28,7 @@ public interface BusinessSampleEntrustRegistrationMapper extends BaseMapperX<Bus
.leftJoin(ConfigEntrustSourceDO.class, ConfigEntrustSourceDO::getId, BusinessSampleEntrustRegistrationDO::getConfigEntrustSourceId)
.selectAll(BusinessSampleEntrustRegistrationDO.class)
.selectAs(ConfigEntrustSourceDO::getName, BusinessSampleEntrustRegistrationExtendRespVO::getConfigEntrustSourceName)
.selectAs(ConfigEntrustSourceDO::getKey, BusinessSampleEntrustRegistrationExtendRespVO::getConfigEntrustSourceKey)
.eqIfPresent(BusinessSampleEntrustRegistrationDO::getEntrustId, reqVO.getEntrustId())
.eqIfPresent(BusinessSampleEntrustRegistrationDO::getEntrustNumber, reqVO.getEntrustNumber())
.eqIfPresent(BusinessSampleEntrustRegistrationDO::getEntrustUnit, reqVO.getEntrustUnit())
@@ -77,6 +78,16 @@ public interface BusinessSampleEntrustRegistrationMapper extends BaseMapperX<Bus
.eqIfPresent(ConfigEntrustSourceDO::getName, reqVO.getConfigEntrustSourceName())
.orderByDesc(BusinessSampleEntrustRegistrationDO::getId));
}
default BusinessSampleEntrustRegistrationExtendRespVO selectExtendById(Long id) {
return selectJoinOne(BusinessSampleEntrustRegistrationExtendRespVO.class, new MPJLambdaWrapperX<BusinessSampleEntrustRegistrationDO>()
.leftJoin(ConfigEntrustSourceDO.class, ConfigEntrustSourceDO::getId, BusinessSampleEntrustRegistrationDO::getConfigEntrustSourceId)
.selectAll(BusinessSampleEntrustRegistrationDO.class)
.selectAs(ConfigEntrustSourceDO::getName, BusinessSampleEntrustRegistrationExtendRespVO::getConfigEntrustSourceName)
.selectAs(ConfigEntrustSourceDO::getKey, BusinessSampleEntrustRegistrationExtendRespVO::getConfigEntrustSourceKey)
.eq(BusinessSampleEntrustRegistrationDO::getId, id)
);
}
//查询报告待编制数据

21
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustUnStandardProjectMapper.java
View File

@@ -37,6 +37,7 @@ public interface BusinessSampleEntrustUnStandardProjectMapper extends BaseMapper
.eqIfPresent(BusinessSampleEntrustUnStandardProjectDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
.eqIfPresent(BusinessSampleEntrustUnStandardProjectDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
.eqIfPresent(BusinessSampleEntrustUnStandardProjectDO::getTaskCount, reqVO.getTaskCount())
.eqIfPresent(BusinessSampleEntrustUnStandardProjectDO::getIsAssignTasked, reqVO.getIsAssignTasked())
.eqIfPresent(BusinessSampleEntrustUnStandardProjectDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
.eqIfPresent(BusinessSampleEntrustUnStandardProjectDO::getUsage, reqVO.getUsage())
.eqIfPresent(BusinessSampleEntrustUnStandardProjectDO::getIsEnabled, reqVO.getIsEnabled())
@@ -72,6 +73,10 @@ public interface BusinessSampleEntrustUnStandardProjectMapper extends BaseMapper
mpjLambdaWrapper.eq(BusinessSampleEntrustUnStandardProjectDO::getAssayDepartmentId, reqVO.getAssayDepartmentId());
}
if (ObjectUtil.isNotEmpty(reqVO.getIsAssignTasked())) {
mpjLambdaWrapper.eq(BusinessSampleEntrustUnStandardProjectDO::getIsAssignTasked, reqVO.getIsAssignTasked());
}
if (ObjectUtil.isNotEmpty(reqVO.getSampleName())) {
mpjLambdaWrapper.like(BusinessSubSampleDO::getSampleName, reqVO.getSampleName());
}
@@ -98,7 +103,21 @@ public interface BusinessSampleEntrustUnStandardProjectMapper extends BaseMapper
return selectList(new LambdaQueryWrapperX<BusinessSampleEntrustUnStandardProjectDO>()
.in(BusinessSampleEntrustUnStandardProjectDO::getBusinessSampleEntrustDetailId, businessSampleEntrustDetailIdList));
}
default List<BusinessSampleEntrustUnStandardProjectExtendRespVO> selectExtendByIds(List<Long> idList) {
return selectJoinList(BusinessSampleEntrustUnStandardProjectExtendRespVO.class, new MPJLambdaWrapperX<BusinessSampleEntrustUnStandardProjectDO>()
.leftJoin(BusinessSampleEntrustDetailDO.class, BusinessSampleEntrustDetailDO::getId, BusinessSampleEntrustUnStandardProjectDO::getBusinessSampleEntrustDetailId)
.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSampleEntrustUnStandardProjectDO::getDictionaryProjectId)
.selectAll(BusinessSampleEntrustUnStandardProjectDO.class)
.selectAs(BusinessSampleEntrustDetailDO::getBusinessSampleEntrustRegistrationId, BusinessSampleEntrustUnStandardProjectExtendRespVO::getBusinessSampleEntrustRegistrationId)
.selectAs(BusinessSampleEntrustDetailDO::getBusinessBaseSampleId, BusinessSampleEntrustUnStandardProjectExtendRespVO::getBusinessBaseSampleId)
.selectAs(DictionaryProjectDO::getName, BusinessSampleEntrustUnStandardProjectExtendRespVO::getDictionaryProjectName)
.selectAs(DictionaryProjectDO::getSimpleName, BusinessSampleEntrustUnStandardProjectExtendRespVO::getDictionaryProjectSimpleName)
.selectAs(DictionaryProjectDO::getShowName, BusinessSampleEntrustUnStandardProjectExtendRespVO::getDictionaryProjectShowName)
.in(BusinessSampleEntrustUnStandardProjectDO::getId, idList)
.orderByAsc(BusinessSampleEntrustUnStandardProjectDO::getId)
);
}
default List<BusinessSampleEntrustUnStandardProjectExtendRespVO> selectByBusinessBaseSampleId(Long businessBaseSampleId) {
return selectJoinList(BusinessSampleEntrustUnStandardProjectExtendRespVO.class, new MPJLambdaWrapperX<BusinessSampleEntrustUnStandardProjectDO>()

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/param/SampleTaskAssignProjectMethodParam.java
View File

@@ -17,6 +17,12 @@ public class SampleTaskAssignProjectMethodParam {
/** 分析方法id **/
private Long configAssayMethodId;
/** 分析类型 **/
private String assayType;
/** 分析任务数 **/
private Integer assayTaskCount;
/** 检测项目数据id列表 **/
private List<Long> assayProjectDataIdList;

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