fix(qms-admin): 修正检测标准相关常量及字段处理
- 删除无用常量 INSPECTION_STANDARD_TESTING_METHOD - 替换检测项获取字典码为 InspectionStandardDetectionType - 在更新检测标准时添加判断类型字段 judgmentType 的设置逻辑
This commit is contained in:
parent
8ce2bf55a2
commit
8bbd89629f
|
|
@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.nflg.wms.common.constant.Constant;
|
|
||||||
import com.nflg.wms.common.exception.NflgException;
|
import com.nflg.wms.common.exception.NflgException;
|
||||||
import com.nflg.wms.common.pojo.PageData;
|
import com.nflg.wms.common.pojo.PageData;
|
||||||
import com.nflg.wms.common.pojo.qo.QmsInspectionStandardAddQO;
|
import com.nflg.wms.common.pojo.qo.QmsInspectionStandardAddQO;
|
||||||
|
|
@ -560,7 +559,7 @@ public class QmsInspectionStandardControllerService {
|
||||||
inspectionStandardService.updateById(standard);
|
inspectionStandardService.updateById(standard);
|
||||||
|
|
||||||
// 3. 处理检测项列表
|
// 3. 处理检测项列表
|
||||||
processItems(dictionaryItemService.getListByDictionaryCode(Constant.INSPECTION_STANDARD_TESTING_METHOD),
|
processItems(dictionaryItemService.getListByDictionaryCode("InspectionStandardDetectionType"),
|
||||||
qo.getInspectionStandardId(), qo.getItems(), userId, userName, now);
|
qo.getInspectionStandardId(), qo.getItems(), userId, userName, now);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -668,6 +667,7 @@ public class QmsInspectionStandardControllerService {
|
||||||
if (qo.getPdfInfo() != null) {
|
if (qo.getPdfInfo() != null) {
|
||||||
content.setPdfInfo(qo.getPdfInfo());
|
content.setPdfInfo(qo.getPdfInfo());
|
||||||
}
|
}
|
||||||
|
content.setJudgmentType(qo.getJudgmentType());
|
||||||
|
|
||||||
content.setUpdateUserId(userId);
|
content.setUpdateUserId(userId);
|
||||||
content.setUpdateUserName(userName);
|
content.setUpdateUserName(userName);
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,4 @@ public class Constant {
|
||||||
public static final String DICTIONARY_AD_TYPE ="AdvertisementType";
|
public static final String DICTIONARY_AD_TYPE ="AdvertisementType";
|
||||||
|
|
||||||
public static final String DICTIONARY_AD_POSITION ="AdvertisementPosition";
|
public static final String DICTIONARY_AD_POSITION ="AdvertisementPosition";
|
||||||
|
|
||||||
public static final String INSPECTION_STANDARD_TESTING_METHOD ="InspectionStandardTestingMethod";
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue