liuchengqian/industrial_measurement
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整数据库表结构

Browse Source
This commit is contained in:
liuchengqian
2022-02-28 13:55:17 +08:00
parent 6ed366abe0
commit 3d053e63de
40 changed files with 1492 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/xkrs/service/impl/DataDictServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.xkrs.service.impl;
import com.xkrs.dao.DataDictDao;
import com.xkrs.dao.QcInspectionItemDictDao;
import com.xkrs.encapsulation.PromptMessageEnum;
import com.xkrs.model.entity.DataDict;
import com.xkrs.model.qo.DataDictQo;
import com.xkrs.model.entity.QcInspectionItemDict;
import com.xkrs.model.qo.QcInspectionItemDictQo;
import com.xkrs.service.DataDictService;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Service;
@ -21,30 +21,31 @@ import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObje
public class DataDictServiceImpl implements DataDictService {
@Resource
private DataDictDao dataDictDao;
private QcInspectionItemDictDao inspectionItemDictDao;
/**
* 添加字典数据
* @param dataDictQo
*
* @param inspectionItemDictQo
* @return
*/
@Override
public String insertDataDict(DataDictQo dataDictQo) {
public String insertDataDict(QcInspectionItemDictQo inspectionItemDictQo) {
Locale locale = LocaleContextHolder.getLocale();
//DataDict byDictChineseName = dataDictDao.findByDictChineseName(dataDictQo.getDictChineseName());
/*DataDict chineseName = dataDictDao.findByModelNumberAndBatchNumberAndMachineCodeAndDictProductNumberAndDictChineseName(dataDictQo.getModelNumber(), dataDictQo.getBatchNumber(), dataDictQo.getMachineCode(), dataDictQo.getDictProductNumber(), dataDictQo.getDictChineseName());
//DataDict byDictChineseName = inspectionItemDictDao.findByDictChineseName(dataDictQo.getDictChineseName());
/*DataDict chineseName = inspectionItemDictDao.findByModelNumberAndBatchNumberAndMachineCodeAndDictProductNumberAndDictChineseName(dataDictQo.getModelNumber(), dataDictQo.getBatchNumber(), dataDictQo.getMachineCode(), dataDictQo.getDictProductNumber(), dataDictQo.getDictChineseName());
if(chineseName != null){
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT,"该产品变量已存在，请勿重复添加！",locale);
}*/
//DataDict byDictEnglishName = dataDictDao.findByDictEnglishName(dataDictQo.getDictEnglishName());
DataDict englishName = dataDictDao.findByDictEnglishName(dataDictQo.getDictEnglishName());
if(englishName != null){
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT,"该产品变量已存在，请勿重复添加！",locale);
//DataDict byDictEnglishName = inspectionItemDictDao.findByDictEnglishName(dataDictQo.getDictEnglishName());
QcInspectionItemDict englishName = inspectionItemDictDao.findByInspectionItemCode(inspectionItemDictQo.getInspectionItemCode());
if (englishName != null) {
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "该产品变量已存在，请勿重复添加！", locale);
}
DataDict dataDict = new DataDict();
dataDict.setDictChineseName(dataDictQo.getDictChineseName());
dataDict.setDictEnglishName(dataDictQo.getDictEnglishName());
dataDictDao.save(dataDict);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,"添加成功！",locale);
QcInspectionItemDict qcInspectionItemDict = new QcInspectionItemDict();
qcInspectionItemDict.setInspectionItemName(inspectionItemDictQo.getInspectionItemName());
qcInspectionItemDict.setInspectionItemCode(inspectionItemDictQo.getInspectionItemCode());
inspectionItemDictDao.save(qcInspectionItemDict);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
}
}