feat(qc): 添加检查项单个样品分析时间字段并修改新增方法返回值
- 在 WmsCheckItem 实体类中添加 sampleAnalysisTime 字段 - 在 WmsCheckItemBo 和 WmsCheckItemVo 中添加 sampleAnalysisTime 属性 - 修改 IWmsCheckItemService.insertByBo 方法返回值从 Boolean 改为 Long - 更新 WmsCheckItemServiceImpl.insertByBo 实现返回新增记录的 ID - 修改 WmsCheckItemController.add 方法返回新增记录的 ID - 在 MyBatis 映射文件中添加 sampleAnalysisTime 字段映射 - 在查询条件中添加对 sampleAnalysisTime 的模糊匹配支持 - 在 WmsCheckItemVo 中添加 Excel 导出注解支持
This commit is contained in:
@@ -72,8 +72,8 @@ public class WmsCheckItemController extends BaseController {
|
||||
@Log(title = "检查项", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsCheckItemBo bo) {
|
||||
return toAjax(iWmsCheckItemService.insertByBo(bo));
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody WmsCheckItemBo bo) {
|
||||
return R.ok(iWmsCheckItemService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -49,4 +49,6 @@ public class WmsCheckItem extends BaseEntity {
|
||||
private String unit;
|
||||
//定性定量
|
||||
private Integer qualitativeQuantitative;
|
||||
//单个样品分析时间
|
||||
private String sampleAnalysisTime;
|
||||
}
|
||||
|
||||
@@ -43,5 +43,7 @@ public class WmsCheckItemBo extends BaseEntity {
|
||||
private String unit;
|
||||
//定性定量
|
||||
private Integer qualitativeQuantitative;
|
||||
//单个样品分析时间
|
||||
private String sampleAnalysisTime;
|
||||
|
||||
}
|
||||
|
||||
@@ -53,6 +53,9 @@ public class WmsCheckItemVo {
|
||||
private String unit;
|
||||
//定性定量
|
||||
private Integer qualitativeQuantitative;
|
||||
//单个样品分析时间
|
||||
@ExcelProperty(value = "单个样品分析时间")
|
||||
private String sampleAnalysisTime;
|
||||
|
||||
private Long checkTaskItemId;
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ public interface IWmsCheckItemService {
|
||||
/**
|
||||
* 新增检查项
|
||||
*/
|
||||
Boolean insertByBo(WmsCheckItemBo bo);
|
||||
Long insertByBo(WmsCheckItemBo bo);
|
||||
|
||||
/**
|
||||
* 修改检查项
|
||||
|
||||
@@ -69,6 +69,7 @@ public class WmsCheckItemServiceImpl implements IWmsCheckItemService {
|
||||
lqw.eq(bo.getStandardTarget() != null, WmsCheckItem::getStandardTarget, bo.getStandardTarget());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getUnit()), WmsCheckItem::getUnit, bo.getUnit());
|
||||
lqw.eq(bo.getQualitativeQuantitative() != null, WmsCheckItem::getQualitativeQuantitative, bo.getQualitativeQuantitative());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getSampleAnalysisTime()), WmsCheckItem::getSampleAnalysisTime, bo.getSampleAnalysisTime());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
@@ -76,14 +77,14 @@ public class WmsCheckItemServiceImpl implements IWmsCheckItemService {
|
||||
* 新增检查项
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsCheckItemBo bo) {
|
||||
public Long insertByBo(WmsCheckItemBo bo) {
|
||||
WmsCheckItem add = BeanUtil.toBean(bo, WmsCheckItem.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setItemId(add.getItemId());
|
||||
}
|
||||
return flag;
|
||||
return add.getItemId();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
<result property="standardTarget" column="standard_target"/>
|
||||
<result property="unit" column="unit"/>
|
||||
<result property="qualitativeQuantitative" column="qualitative_quantitative"/>
|
||||
<result property="sampleAnalysisTime" column="sample_analysis_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
@@ -28,6 +29,7 @@
|
||||
standard_target,
|
||||
unit,
|
||||
qualitative_quantitative,
|
||||
sample_analysis_time,
|
||||
create_by,
|
||||
create_time,
|
||||
update_by,
|
||||
|
||||
Reference in New Issue
Block a user