Commit c75d4819 authored by 王飞's avatar 王飞

Merge branch 'gaoying' into 'dev'

Gaoying

See merge request !104
parents 7ceda232 6cf8eb48
...@@ -71,9 +71,11 @@ public class SampleManagementServiceImpl extends ServiceImpl<SampleManagementMap ...@@ -71,9 +71,11 @@ public class SampleManagementServiceImpl extends ServiceImpl<SampleManagementMap
public int insertSampleManagement(Sample sampleManagement) public int insertSampleManagement(Sample sampleManagement)
{ {
// 判断车辆识别码是否重复 // 判断车辆识别码是否重复
int dentificationCode = sampleManagementMapper.selectIdentificationCodeCount(sampleManagement); if(Sample.SAMPLE_FLAG_CAR.equals(sampleManagement.getFlag())){
if(dentificationCode>0){ int dentificationCode = sampleManagementMapper.selectIdentificationCodeCount(sampleManagement);
throw new ServiceException("车辆识别码已存在"); if(dentificationCode>0){
throw new ServiceException("车辆识别码已存在");
}
} }
// 判断样品编号是否存在 // 判断样品编号是否存在
int sampleNumber = sampleManagementMapper.selectSampleNumberCount(sampleManagement); int sampleNumber = sampleManagementMapper.selectSampleNumberCount(sampleManagement);
...@@ -95,9 +97,11 @@ public class SampleManagementServiceImpl extends ServiceImpl<SampleManagementMap ...@@ -95,9 +97,11 @@ public class SampleManagementServiceImpl extends ServiceImpl<SampleManagementMap
public int updateSampleManagement(Sample sampleManagement) public int updateSampleManagement(Sample sampleManagement)
{ {
// 判断车辆识别码是否重复 // 判断车辆识别码是否重复
int dentificationCode = sampleManagementMapper.selectIdentificationCodeCount(sampleManagement); if(Sample.SAMPLE_FLAG_CAR.equals(sampleManagement.getFlag())){
if(dentificationCode>0){ int dentificationCode = sampleManagementMapper.selectIdentificationCodeCount(sampleManagement);
throw new ServiceException("车辆识别码已存在"); if(dentificationCode>0){
throw new ServiceException("车辆识别码已存在");
}
} }
// 判断样品编号是否存在 // 判断样品编号是否存在
int sampleNumber = sampleManagementMapper.selectSampleNumberCount(sampleManagement); int sampleNumber = sampleManagementMapper.selectSampleNumberCount(sampleManagement);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment