修改表名T_BSN_SB_SMP_ASMT到T_BSN_SB_SMP_ASMT_PRJ
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class BusinessSubSampleAssessmentExtendRespVO extends BusinessSubSampleAssessmentRespVO {
|
public class BusinessSubSampleAssessmentProjectExtendRespVO extends BusinessSubSampleAssessmentProjectRespVO {
|
||||||
|
|
||||||
/** 分析方法名称 **/
|
/** 分析方法名称 **/
|
||||||
@Schema(description = "分析方法名称")
|
@Schema(description = "分析方法名称")
|
||||||
@@ -11,7 +11,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
|
|||||||
|
|
||||||
@Schema(description = "管理后台 - 子样判定数据业务分页 Request VO")
|
@Schema(description = "管理后台 - 子样判定数据业务分页 Request VO")
|
||||||
@Data
|
@Data
|
||||||
public class BusinessSubSampleAssessmentPageReqVO extends PageParam {
|
public class BusinessSubSampleAssessmentProjectPageReqVO extends PageParam {
|
||||||
|
|
||||||
@Schema(description = "分样id")
|
@Schema(description = "分样id")
|
||||||
private Long businessSubParentSampleId;
|
private Long businessSubParentSampleId;
|
||||||
@@ -10,7 +10,7 @@ import com.alibaba.excel.annotation.*;
|
|||||||
@Schema(description = "管理后台 - 子样判定数据业务 Response VO")
|
@Schema(description = "管理后台 - 子样判定数据业务 Response VO")
|
||||||
@Data
|
@Data
|
||||||
@ExcelIgnoreUnannotated
|
@ExcelIgnoreUnannotated
|
||||||
public class BusinessSubSampleAssessmentRespVO {
|
public class BusinessSubSampleAssessmentProjectRespVO {
|
||||||
|
|
||||||
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23478")
|
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23478")
|
||||||
@ExcelProperty("ID")
|
@ExcelProperty("ID")
|
||||||
@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
|
|||||||
|
|
||||||
@Schema(description = "管理后台 - 子样判定数据业务新增/修改 Request VO")
|
@Schema(description = "管理后台 - 子样判定数据业务新增/修改 Request VO")
|
||||||
@Data
|
@Data
|
||||||
public class BusinessSubSampleAssessmentSaveReqVO {
|
public class BusinessSubSampleAssessmentProjectSaveReqVO {
|
||||||
|
|
||||||
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23478")
|
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23478")
|
||||||
private Long id;
|
private Long id;
|
||||||
@@ -12,8 +12,8 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
|||||||
*
|
*
|
||||||
* @author 后台管理
|
* @author 后台管理
|
||||||
*/
|
*/
|
||||||
@TableName("t_bsn_sb_smp_asmt")
|
@TableName("t_bsn_sb_smp_asmt_prj")
|
||||||
@KeySequence("t_bsn_sb_smp_asmt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
|
@KeySequence("t_bsn_sb_smp_asmt_prj_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@ToString(callSuper = true)
|
@ToString(callSuper = true)
|
||||||
@@ -23,7 +23,7 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
|||||||
/**
|
/**
|
||||||
* 支持业务基类继承:isBusiness=true 时继承 BusinessBaseDO,否则继承 BaseDO
|
* 支持业务基类继承:isBusiness=true 时继承 BusinessBaseDO,否则继承 BaseDO
|
||||||
*/
|
*/
|
||||||
public class BusinessSubSampleAssessmentDO extends BusinessBaseDO {
|
public class BusinessSubSampleAssessmentProjectDO extends BusinessBaseDO {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@ import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataPa
|
|||||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataReqVO;
|
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataReqVO;
|
||||||
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
|
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
|
||||||
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAnalysisGroupDO;
|
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAnalysisGroupDO;
|
||||||
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentDO;
|
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentProjectDO;
|
||||||
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
|
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
|
||||||
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
|
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
|
||||||
import com.zt.plat.module.qms.enums.QmsCommonConstant;
|
import com.zt.plat.module.qms.enums.QmsCommonConstant;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import org.apache.ibatis.annotations.Param;
|
|||||||
* @author 后台管理
|
* @author 后台管理
|
||||||
*/
|
*/
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface BusinessSubParentSampleAssessmentMapper extends BaseMapperX<BusinessSubParentSampleAssessmentDO> {
|
public interface BusinessSubParentSampleAssessmentProjectMapper extends BaseMapperX<BusinessSubParentSampleAssessmentDO> {
|
||||||
|
|
||||||
List<BusinessSubParentSampleAssessmentGroupRespVO> selectUnReportMethodGroupList(@Param("reqVO") BusinessSubParentSampleAssessmentGroupReqVO reqVO);
|
List<BusinessSubParentSampleAssessmentGroupRespVO> selectUnReportMethodGroupList(@Param("reqVO") BusinessSubParentSampleAssessmentGroupReqVO reqVO);
|
||||||
|
|
||||||
@@ -55,11 +55,11 @@ public interface BusinessSubParentSampleAssessmentMapper extends BaseMapperX<Bus
|
|||||||
.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSubParentSampleAssessmentDO::getDictionaryProjectId)
|
.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSubParentSampleAssessmentDO::getDictionaryProjectId)
|
||||||
.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId)
|
.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId)
|
||||||
.selectAll(BusinessSubParentSampleAssessmentDO.class)
|
.selectAll(BusinessSubParentSampleAssessmentDO.class)
|
||||||
.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessSubSampleAssessmentExtendRespVO::getDictionaryProjectUnit)
|
.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectUnit)
|
||||||
.selectAs(DictionaryProjectDO::getKey, BusinessSubSampleAssessmentExtendRespVO::getDictionaryProjectKey)
|
.selectAs(DictionaryProjectDO::getKey, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectKey)
|
||||||
.selectAs(DictionaryProjectDO::getSimpleName, BusinessSubSampleAssessmentExtendRespVO::getSimpleName)
|
.selectAs(DictionaryProjectDO::getSimpleName, BusinessSubSampleAssessmentProjectExtendRespVO::getSimpleName)
|
||||||
.selectAs(DictionaryProjectDO::getShowName, BusinessSubSampleAssessmentExtendRespVO::getShowName)
|
.selectAs(DictionaryProjectDO::getShowName, BusinessSubSampleAssessmentProjectExtendRespVO::getShowName)
|
||||||
.selectAs(ConfigAssayMethodDO::getName, BusinessSubSampleAssessmentExtendRespVO::getConfigAssayMethodName)
|
.selectAs(ConfigAssayMethodDO::getName, BusinessSubSampleAssessmentProjectExtendRespVO::getConfigAssayMethodName)
|
||||||
.in(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, businessSubParentSampleIds)
|
.in(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, businessSubParentSampleIds)
|
||||||
.eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
|
.eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -9,7 +9,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
|
|||||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||||
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
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.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
|
||||||
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleAssessmentMapper;
|
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleAssessmentProjectMapper;
|
||||||
|
|
||||||
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
|
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||||
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
|
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
|
||||||
@@ -24,13 +24,13 @@ import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
|
|||||||
public class BusinessSubParentSampleAssessmentServiceImpl implements BusinessSubParentSampleAssessmentService {
|
public class BusinessSubParentSampleAssessmentServiceImpl implements BusinessSubParentSampleAssessmentService {
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private BusinessSubParentSampleAssessmentMapper businessSubParentSampleAssessmentMapper;
|
private BusinessSubParentSampleAssessmentProjectMapper businessSubParentSampleAssessmentProjectMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BusinessSubParentSampleAssessmentRespVO createBusinessSubParentSampleAssessment(BusinessSubParentSampleAssessmentSaveReqVO createReqVO) {
|
public BusinessSubParentSampleAssessmentRespVO createBusinessSubParentSampleAssessment(BusinessSubParentSampleAssessmentSaveReqVO createReqVO) {
|
||||||
// 插入
|
// 插入
|
||||||
BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessment = BeanUtils.toBean(createReqVO, BusinessSubParentSampleAssessmentDO.class);
|
BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessment = BeanUtils.toBean(createReqVO, BusinessSubParentSampleAssessmentDO.class);
|
||||||
businessSubParentSampleAssessmentMapper.insert(businessSubParentSampleAssessment);
|
businessSubParentSampleAssessmentProjectMapper.insert(businessSubParentSampleAssessment);
|
||||||
// 返回
|
// 返回
|
||||||
return BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentRespVO.class);
|
return BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentRespVO.class);
|
||||||
}
|
}
|
||||||
@@ -41,7 +41,7 @@ public class BusinessSubParentSampleAssessmentServiceImpl implements BusinessSub
|
|||||||
validateBusinessSubParentSampleAssessmentExists(updateReqVO.getId());
|
validateBusinessSubParentSampleAssessmentExists(updateReqVO.getId());
|
||||||
// 更新
|
// 更新
|
||||||
BusinessSubParentSampleAssessmentDO updateObj = BeanUtils.toBean(updateReqVO, BusinessSubParentSampleAssessmentDO.class);
|
BusinessSubParentSampleAssessmentDO updateObj = BeanUtils.toBean(updateReqVO, BusinessSubParentSampleAssessmentDO.class);
|
||||||
businessSubParentSampleAssessmentMapper.updateById(updateObj);
|
businessSubParentSampleAssessmentProjectMapper.updateById(updateObj);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -49,7 +49,7 @@ public class BusinessSubParentSampleAssessmentServiceImpl implements BusinessSub
|
|||||||
// 校验存在
|
// 校验存在
|
||||||
validateBusinessSubParentSampleAssessmentExists(id);
|
validateBusinessSubParentSampleAssessmentExists(id);
|
||||||
// 删除
|
// 删除
|
||||||
businessSubParentSampleAssessmentMapper.deleteById(id);
|
businessSubParentSampleAssessmentProjectMapper.deleteById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -57,30 +57,30 @@ public class BusinessSubParentSampleAssessmentServiceImpl implements BusinessSub
|
|||||||
// 校验存在
|
// 校验存在
|
||||||
validateBusinessSubParentSampleAssessmentExists(ids);
|
validateBusinessSubParentSampleAssessmentExists(ids);
|
||||||
// 删除
|
// 删除
|
||||||
businessSubParentSampleAssessmentMapper.deleteByIds(ids);
|
businessSubParentSampleAssessmentProjectMapper.deleteByIds(ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void validateBusinessSubParentSampleAssessmentExists(List<Long> ids) {
|
private void validateBusinessSubParentSampleAssessmentExists(List<Long> ids) {
|
||||||
List<BusinessSubParentSampleAssessmentDO> list = businessSubParentSampleAssessmentMapper.selectByIds(ids);
|
List<BusinessSubParentSampleAssessmentDO> list = businessSubParentSampleAssessmentProjectMapper.selectByIds(ids);
|
||||||
if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
|
if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
|
||||||
throw exception(BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS);
|
throw exception(BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void validateBusinessSubParentSampleAssessmentExists(Long id) {
|
private void validateBusinessSubParentSampleAssessmentExists(Long id) {
|
||||||
if (businessSubParentSampleAssessmentMapper.selectById(id) == null) {
|
if (businessSubParentSampleAssessmentProjectMapper.selectById(id) == null) {
|
||||||
throw exception(BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS);
|
throw exception(BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BusinessSubParentSampleAssessmentDO getBusinessSubParentSampleAssessment(Long id) {
|
public BusinessSubParentSampleAssessmentDO getBusinessSubParentSampleAssessment(Long id) {
|
||||||
return businessSubParentSampleAssessmentMapper.selectById(id);
|
return businessSubParentSampleAssessmentProjectMapper.selectById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageResult<BusinessSubParentSampleAssessmentDO> getBusinessSubParentSampleAssessmentPage(BusinessSubParentSampleAssessmentPageReqVO pageReqVO) {
|
public PageResult<BusinessSubParentSampleAssessmentDO> getBusinessSubParentSampleAssessmentPage(BusinessSubParentSampleAssessmentPageReqVO pageReqVO) {
|
||||||
return businessSubParentSampleAssessmentMapper.selectPage(pageReqVO);
|
return businessSubParentSampleAssessmentProjectMapper.selectPage(pageReqVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user