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

字段修改

Browse Source
This commit is contained in:
王兴荣
2025-11-04 19:35:23 +08:00
parent b3e11fe92e
commit 09ca90355d
34 changed files with 113 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCDataController.java
View File

@@ -47,7 +47,7 @@ public class BusinessQCDataController implements BusinessControllerMarker {
return success(businessQCDataService.createBusinessQCData(createReqVO));
}
@PutMapping("/update")
@PostMapping("/update")
@Operation(summary = "更新质控样业务")
//@PreAuthorize("@ss.hasPermission('qms:business-QC-data:update')")
public CommonResult<Boolean> updateBusinessQCData(@Valid @RequestBody BusinessQCDataSaveReqVO updateReqVO) {

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

@@ -40,6 +40,9 @@ public class BusinessAssayProjectDataPageReqVO extends PageParam {
@Schema(description = "是否不参与超差判定")
private Integer isNotAssessment;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否启用")
private Integer isEnabled;

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

@@ -46,6 +46,9 @@ public class BusinessAssayProjectDataReqVO {
@Schema(description = "是否不参与超差判定")
private Integer isNotAssessment;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否启用")
private Integer isEnabled;

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

@@ -50,6 +50,9 @@ public class BusinessAssayProjectDataRespVO {
@ExcelProperty("是否不参与超差判定")
private Integer isNotAssessment;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否启用")
private Integer isEnabled;

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

@@ -38,6 +38,9 @@ public class BusinessAssayProjectDataSaveReqVO {
@NotNull(message = "是否不参与超差判定不能为空")
private Integer isNotAssessment;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "是否启用不能为空")
private Integer isEnabled;

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

@@ -49,6 +49,9 @@ public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
@Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
private String assessmentStatus;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否已上报")
private Integer isReported;

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

@@ -60,6 +60,9 @@ public class BusinessSubParentSampleAssessmentRespVO {
@ExcelProperty("判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差")
private String assessmentStatus;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否已上报")
private Integer isReported;

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

@@ -56,6 +56,9 @@ public class BusinessSubParentSampleAssessmentSaveReqVO {
@NotEmpty(message = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差不能为空")
private String assessmentStatus;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "是否已上报不能为空")
private Integer isReported;

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

@@ -52,6 +52,9 @@ public class BusinessSubSampleAssessmentPageReqVO extends PageParam {
@Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1")
private String assessmentStatus;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否已上报")
private Integer isReported;

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

@@ -65,6 +65,9 @@ public class BusinessSubSampleAssessmentRespVO {
@ExcelProperty("判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差")
private String assessmentStatus;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否已上报")
private Integer isReported;

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

@@ -60,6 +60,9 @@ public class BusinessSubSampleAssessmentSaveReqVO {
@Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1")
private String assessmentStatus;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "是否已上报不能为空")
private Integer isReported;

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

@@ -82,6 +82,11 @@ public class BusinessAssayProjectDataDO extends BusinessBaseDO {
@TableField("IS_ENBD")
private Integer isEnabled;
/**
* 方法检出下限值
*/
@TableField("MIN_LIM_VAL")
private String minimumLimitValue;
/**
* 乐观锁
*/
@TableField("UPD_CNT")

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

@@ -93,6 +93,11 @@ public class BusinessSubParentSampleAssessmentDO extends BusinessBaseDO {
@TableField("ASMT_STS")
private String assessmentStatus;
/**
* 方法检出下限值
*/
@TableField("MIN_LIM_VAL")
private String minimumLimitValue;
/**
* 是否已上报
*/
@TableField("IS_RPOD")

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

@@ -98,6 +98,11 @@ public class BusinessSubSampleAssessmentDO extends BusinessBaseDO {
@TableField("ASMT_STS")
private String assessmentStatus;
/**
* 方法检出下限值
*/
@TableField("MIN_LIM_VAL")
private String minimumLimitValue;
/**
* 是否已上报
*/
@TableField("IS_RPOD")

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

@@ -16,6 +16,12 @@ public class ConfigAssayMethodPageReqVO extends PageParam {
@Schema(description = "方法库ID", example = "9346")
private Long methodConfigId;
@Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102")
private Long dictionaryBusinessId;
@Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等")
private String dictionaryBusinessKey;
@Schema(description = "方法名称", example = "李四")
private String name;

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

@@ -43,6 +43,9 @@ public class ConfigAssayMethodProjectPageReqVO extends PageParam {
@Schema(description = "是否默认启用,1-启用，0-不启用")
private Integer isDefaultEnabled;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "排序号")
private Integer sortNo;

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

@@ -56,6 +56,9 @@ public class ConfigAssayMethodProjectRespVO {
@ExcelProperty("是否默认启用,1-启用，0-不启用")
private Integer isDefaultEnabled;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "排序号")
@ExcelProperty("排序号")
private Integer sortNo;

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

@@ -47,6 +47,9 @@ public class ConfigAssayMethodProjectSaveReqVO {
@NotNull(message = "是否默认启用,1-启用，0-不启用不能为空")
private Integer isDefaultEnabled;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "排序号")
private Integer sortNo;

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

@@ -16,6 +16,12 @@ public class ConfigAssayMethodReqVO {
@Schema(description = "方法库ID", example = "9346")
private Long methodConfigId;
@Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102")
private Long dictionaryBusinessId;
@Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等")
private String dictionaryBusinessKey;
@Schema(description = "方法名称", example = "李四")
private String name;

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

@@ -20,6 +20,12 @@ public class ConfigAssayMethodRespVO {
@ExcelProperty("方法库ID")
private Long methodConfigId;
@Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102")
private Long dictionaryBusinessId;
@Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等")
private String dictionaryBusinessKey;
@Schema(description = "方法名称", example = "李四")
@ExcelProperty("方法名称")
private String name;

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

@@ -15,6 +15,12 @@ public class ConfigAssayMethodSaveReqVO {
@Schema(description = "方法库ID", example = "9346")
private Long methodConfigId;
@Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102")
private Long dictionaryBusinessId;
@Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等")
private String dictionaryBusinessKey;
@Schema(description = "方法名称", example = "李四")
private String name;

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

@@ -43,6 +43,9 @@ public class ConfigQCSampleMethodPageReqVO extends PageParam {
@Schema(description = "映射检测信息配置,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
private String configInfomation;
@Schema(description = "排序号")
private Integer sortNo;
@Schema(description = "所属部门")
private String systemDepartmentCode;

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

@@ -56,6 +56,9 @@ public class ConfigQCSampleMethodRespVO {
@ExcelProperty("映射检测信息配置,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
private String configInfomation;
@Schema(description = "排序号")
private Integer sortNo;
@Schema(description = "所属部门")
@ExcelProperty("所属部门")
private String systemDepartmentCode;

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

@@ -49,6 +49,9 @@ public class ConfigQCSampleMethodSaveReqVO {
@Schema(description = "映射检测信息配置,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
private String configInfomation;
@Schema(description = "排序号")
private Integer sortNo;
@Schema(description = "所属部门")
private String systemDepartmentCode;

10
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodDO.java
View File

@@ -37,6 +37,16 @@ public class ConfigAssayMethodDO extends BusinessBaseDO {
@TableField("MTHD_CFG_ID")
private Long methodConfigId;
/**
* 方法类别ID,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等
*/
@TableField("DIC_BSN_ID")
private Long dictionaryBusinessId;
/**
* 方法类别KEY,字典表【T_DIC_BSN】方法类别：methodCategory，容量法、等离子发射光谱法、原子吸收分光光度等
*/
@TableField("DIC_BSN_KY")
private String dictionaryBusinessKey;
/**
* 方法名称
*/
@TableField("NAME")

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

@@ -82,6 +82,11 @@ public class ConfigAssayMethodProjectDO extends BusinessBaseDO {
@TableField("IS_DFT_ENBD")
private Integer isDefaultEnabled;
/**
* 方法检出下限值
*/
@TableField("MIN_LIM_VAL")
private String minimumLimitValue;
/**
* 排序号
*/
@TableField("SRT_NO")

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

@@ -82,6 +82,11 @@ public class ConfigQCSampleMethodDO extends BusinessBaseDO {
@TableField("CFG_INF")
private String configInfomation;
/**
* 排序号
*/
@TableField("SRT_NO")
private Integer sortNo;
/**
* 所属部门
*/
@TableField("SYS_DEPT_CD")

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.java
View File

@@ -24,6 +24,8 @@ public interface ConfigAssayMethodMapper extends BaseMapperX<ConfigAssayMethodDO
default List<ConfigAssayMethodDO> selectList(ConfigAssayMethodReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<ConfigAssayMethodDO>()
.eqIfPresent(ConfigAssayMethodDO::getMethodConfigId, reqVO.getMethodConfigId())
.eqIfPresent(ConfigAssayMethodDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId())
.eqIfPresent(ConfigAssayMethodDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey())
.likeIfPresent(ConfigAssayMethodDO::getName, reqVO.getName())
.eqIfPresent(ConfigAssayMethodDO::getMethodCode, reqVO.getMethodCode())
.eqIfPresent(ConfigAssayMethodDO::getDescription, reqVO.getDescription())
@@ -45,6 +47,8 @@ public interface ConfigAssayMethodMapper extends BaseMapperX<ConfigAssayMethodDO
default PageResult<ConfigAssayMethodDO> selectPage(ConfigAssayMethodPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ConfigAssayMethodDO>()
.eqIfPresent(ConfigAssayMethodDO::getMethodConfigId, reqVO.getMethodConfigId())
.eqIfPresent(ConfigAssayMethodDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId())
.eqIfPresent(ConfigAssayMethodDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey())
.likeIfPresent(ConfigAssayMethodDO::getName, reqVO.getName())
.eqIfPresent(ConfigAssayMethodDO::getMethodCode, reqVO.getMethodCode())
.eqIfPresent(ConfigAssayMethodDO::getDescription, reqVO.getDescription())

1
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodProjectMapper.java
View File

@@ -35,6 +35,7 @@ public interface ConfigAssayMethodProjectMapper extends BaseMapperX<ConfigAssayM
.eqIfPresent(ConfigAssayMethodProjectDO::getFormula, reqVO.getFormula())
.eqIfPresent(ConfigAssayMethodProjectDO::getAssessmentAccuracy, reqVO.getAssessmentAccuracy())
.eqIfPresent(ConfigAssayMethodProjectDO::getIsDefaultEnabled, reqVO.getIsDefaultEnabled())
.eqIfPresent(ConfigAssayMethodProjectDO::getMinimumLimitValue, reqVO.getMinimumLimitValue())
.eqIfPresent(ConfigAssayMethodProjectDO::getSortNo, reqVO.getSortNo())
.eqIfPresent(ConfigAssayMethodProjectDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
.betweenIfPresent(ConfigAssayMethodProjectDO::getCreateTime, reqVO.getCreateTime())

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

@@ -28,12 +28,6 @@ public class DictionaryProjectPageReqVO extends PageParam {
@Schema(description = "键值")
private String key;
@Schema(description = "物料属性ID", example = "29278")
private Long materialPropertiesId;
@Schema(description = "物料属性编码")
private String materialPropertiesCode;
@Schema(description = "所属部门")
private String systemDepartmentCode;

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/vo/DictionaryProjectRespVO.java
View File

@@ -36,14 +36,6 @@ public class DictionaryProjectRespVO {
@ExcelProperty("键值")
private String key;
@Schema(description = "物料属性ID", example = "29278")
@ExcelProperty("物料属性ID")
private Long materialPropertiesId;
@Schema(description = "物料属性编码")
@ExcelProperty("物料属性编码")
private String materialPropertiesCode;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("所属部门")
private String systemDepartmentCode;

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

@@ -29,12 +29,6 @@ public class DictionaryProjectSaveReqVO {
@Schema(description = "键值")
private String key;
@Schema(description = "物料属性ID", example = "29278")
private Long materialPropertiesId;
@Schema(description = "物料属性编码")
private String materialPropertiesCode;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
private String systemDepartmentCode;

10
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/dal/dataobject/DictionaryProjectDO.java
View File

@@ -54,16 +54,6 @@ public class DictionaryProjectDO extends BusinessBaseDO {
@TableField("KY")
private String key;
/**
* 物料属性ID
*/
@TableField("MTRL_PRPS_ID")
private Long materialPropertiesId;
/**
* 物料属性编码
*/
@TableField("MTRL_PRPS_CD")
private String materialPropertiesCode;
/**
* 所属部门
*/
@TableField("SYS_DEPT_CD")

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/dal/mapper/DictionaryProjectMapper.java
View File

@@ -22,8 +22,6 @@ public interface DictionaryProjectMapper extends BaseMapperX<DictionaryProjectDO
.likeIfPresent(DictionaryProjectDO::getSimpleName, reqVO.getSimpleName())
.likeIfPresent(DictionaryProjectDO::getShowName, reqVO.getShowName())
.eqIfPresent(DictionaryProjectDO::getKey, reqVO.getKey())
.eqIfPresent(DictionaryProjectDO::getMaterialPropertiesId, reqVO.getMaterialPropertiesId())
.eqIfPresent(DictionaryProjectDO::getMaterialPropertiesCode, reqVO.getMaterialPropertiesCode())
.eqIfPresent(DictionaryProjectDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
.betweenIfPresent(DictionaryProjectDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(DictionaryProjectDO::getRemark, reqVO.getRemark())