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

Compare commits

base: zgty:dc23a86c2900035cb42b48a93231385a98ead762
Branches Tags
zgty:test zgty:lims_dev
..
compare: zgty:5ca225352222794e973455296468c3a657f4cf86
Branches Tags
zgty:test zgty:lims_dev

2 Commits
dc23a86c29 ... 5ca2253522

Author SHA1 Message Date
wxr
5ca2253522 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2025-12-24 18:03:32 +08:00
wxr
76b44686fb 复测及原始记录修改 2025-12-24 18:03:22 +08:00
7 changed files with 86 additions and 23 deletions
Expand all files Collapse all files

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

@@ -15,6 +15,9 @@ public class BusinessSubParentSampleAssessmentProjectPageReqVO extends PageParam
@Schema(description = "样品分样ID", example = "23188")
private Long businessSubParentSampleId;
@Schema(description = "班组判定数据业务ID")
private Long businessSubParentSampleAssessmentId;
@Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", example = "17642")
private Long dictionaryProjectId;

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

@@ -90,7 +90,7 @@ public class BusinessSubParentSampleAssessmentProjectDO extends BusinessBaseDO {
/**
* 判定值
*/
@TableField("ASMT_VAL")
@TableField(value = "ASMT_VAL", updateStrategy = FieldStrategy.ALWAYS)
private String assessmentValue;
/**
* 判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差

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

@@ -28,6 +28,7 @@ public interface BusinessSubParentSampleAssessmentProjectMapper extends BaseMapp
default PageResult<BusinessSubParentSampleAssessmentProjectDO> selectPage(BusinessSubParentSampleAssessmentProjectPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<BusinessSubParentSampleAssessmentProjectDO>()
.eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
.eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleAssessmentId, reqVO.getBusinessSubParentSampleAssessmentId())
.eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
.eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
.eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
@@ -69,9 +70,16 @@ public interface BusinessSubParentSampleAssessmentProjectMapper extends BaseMapp
.eq(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId, configAssayMethodId));
}
default List<BusinessSubParentSampleAssessmentProjectDO> selectByBusinessSubParentSampleAssessmentIdAndDictionaryProjectIds(Long businessSubParentSampleAssessmentId, List<Long> recheckDictionaryProjectIdList) {
return selectList(new LambdaQueryWrapper<BusinessSubParentSampleAssessmentProjectDO>()
.eq(BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleAssessmentId, businessSubParentSampleAssessmentId)
.in(BusinessSubParentSampleAssessmentProjectDO::getDictionaryProjectId, recheckDictionaryProjectIdList));
}
List<NoReportSubParentSampleAssessmentRespVO> selectNoReportSubParentSampleAssessment(@Param("reqVO") BusinessSubParentSampleAssessmentGroupReqVO reqVO);
List<RecheckSubSampleParentMethodRespVO> getRecheckAssayMethodList(@Param("baseSampleId") Long baseSampleId, @Param("businessSubParentSampleId") Long businessSubParentSampleId, @Param("configAssayMethodId") Long configAssayMethodId);
List<RecheckSubSampleParentMethodRespVO> getRecheckAssayMethodList(@Param("baseSampleId") Long baseSampleId, @Param("businessSubParentSampleId") Long businessSubParentSampleId, @Param("configAssayMethodId") Long configAssayMethodId, @Param("assayDepartmentId") Long assayDepartmentId);
}

24
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java
View File

@@ -28,7 +28,6 @@ import com.alibaba.qlexpress4.QLResult;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.zt.plat.framework.common.exception.ServiceException;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
@@ -37,7 +36,6 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayProjectDa
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskParameterDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessBaseSampleDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
@@ -71,7 +69,6 @@ import com.zt.plat.module.qms.business.config.controller.vo.*;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectAssessmentDO;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigRuleDO;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleDO;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleMethodDO;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleParentMethodDO;
import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectAssessmentMapper;
import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectMapper;
@@ -479,10 +476,15 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList2 = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2);
for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) {
HashedMap<String, Object> newMap = SerializationUtils.clone(map);
String projectSymbol = "";
if (StringUtils.isNotBlank(ep.getSymbol()) && !"=".equals(ep.getSymbol())) {
projectSymbol = ep.getSymbol();
}
// newMap.put(ep.getName(), ep.getValue());
newMap.put("projectName", ep.getName());
newMap.put("projectValue", ep.getValue());
newMap.put("projectSymbol", ep.getSymbol());
newMap.put("projectSymbol", projectSymbol);
newMap.put("projectUnit", ep.getUnit());
if (StringUtils.isNotEmpty(ep.getFormula())) {
BusinessAssayParameterDataReqVO parameterDataSearch = new BusinessAssayParameterDataReqVO();
parameterDataSearch.setBusinessAssayProjectDataId(ep.getId());
@@ -529,10 +531,15 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList2 = businessQCManagementProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2);
for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) {
HashedMap<String, Object> newMap = SerializationUtils.clone(map);
String projectSymbol = "";
if (StringUtils.isNotBlank(ep.getSymbol()) && !"=".equals(ep.getSymbol())) {
projectSymbol = ep.getSymbol();
}
// newMap.put(ep.getName(), ep.getValue());
newMap.put("projectName", ep.getName());
newMap.put("projectValue", ep.getValue());
newMap.put("projectSymbol", ep.getSymbol());
newMap.put("projectSymbol", projectSymbol);
newMap.put("projectUnit", ep.getUnit());
if (StringUtils.isNotEmpty(ep.getFormula())) {
BusinessQCManagementParameterDataReqVO parameterDataSearch = new BusinessQCManagementParameterDataReqVO();
parameterDataSearch.setBusinessQCManagementProjectDataId(ep.getId());
@@ -567,11 +574,16 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
parameterDataSearch2.setBusinessQCCoefficientDataId(businessQCCoefficientData.getId());
List<BusinessAssayProjectAndParameterRespVO> plist2 = businessQCCoefficientParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch2);
for (BusinessAssayProjectAndParameterRespVO p : plist2) {
String projectSymbol = "";
if (StringUtils.isNotBlank(p.getSymbol()) && !"=".equals(p.getSymbol())) {
projectSymbol = p.getSymbol();
}
//map.put(p.getName(), p.getValue());
HashedMap<String, Object> newMap = SerializationUtils.clone(map);
newMap.put("projectName", p.getName());
newMap.put("projectValue", p.getValue());
newMap.put("projectSymbol", p.getSymbol());
newMap.put("projectSymbol", projectSymbol);
newMap.put("projectUnit", p.getUnit());
datas.add(map);
}
}

9
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java
View File

@@ -725,7 +725,14 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
}
}
//处理已查询的数据
BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameterRespVO = businessAssayParameterDataList.stream().filter(f -> f.getBizId().equals(businessAssayParameterDataDO.getId())).findFirst().orElse(null);
if (businessAssayProjectAndParameterRespVO != null) {
businessAssayProjectAndParameterRespVO.setValue(businessAssayParameterDataDO.getValue());
}
//更新
businessAssayParameterDataMapper.updateById(businessAssayParameterDataDO);
}
}

56
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

5
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml
View File

@@ -157,13 +157,16 @@
WHERE
tmasm.DELETED = 0
AND tmas.BSE_SMP_ID = #{baseSampleId}
AND tcam.ASY_DEPT_ID = #{assayDepartmentId}
AND tmasd.DIC_PRJ_ID IN (
SELECT
tbspsap.DIC_PRJ_ID
FROM
T_BSN_SB_PRN_SMP_ASMT_PRJ tbspsap
WHERE
tbspsap.BSN_SB_PRN_SMP_ID = #{businessSubParentSampleId}
tbspsap.DELETED = 0
AND tbspsap.ASMT_STS = 'normal'
AND tbspsap.BSN_SB_PRN_SMP_ID = #{businessSubParentSampleId}
AND tbspsap.CFG_ASY_MTHD_ID = #{configAssayMethodId}
)