QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 车型生成BUG

Browse Source
This commit is contained in:
mzaxd
2024-08-01 19:27:08 +08:00
parent fa71c51bf5
commit 980f9e7ffa
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/ModelExcelVO.java
+1 -1
View File
@@ -16,7 +16,7 @@ public class ModelExcelVO {
@Dict(dicCode = "model_status") @Dict(dicCode = "model_status")
@Excel(name = "车型状态", dicCode = "model_status") @Excel(name = "车型状态")
private String modelState; private String modelState;
private String sort; private String sort;
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+9 -2
View File
@@ -678,7 +678,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
private List<String> validationModelList(List<ModelExcelVO> list, List<SysDictItemCore> listDict) { private List<String> validationModelList(List<ModelExcelVO> list, List<SysDictItemCore> listDict) {
List<String> errorMsgs = new ArrayList<>(); List<String> errorMsgs = new ArrayList<>();
int i = 4; int i = 2;
Iterator<ModelExcelVO> iterator = list.iterator(); Iterator<ModelExcelVO> iterator = list.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
ModelExcelVO data = iterator.next(); ModelExcelVO data = iterator.next();
@@ -1099,13 +1099,20 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
// 批量检查数据是否有效 // 批量检查数据是否有效
errorMsgs = this.validationModelList(modelExcelVOList, listDict); errorMsgs = this.validationModelList(modelExcelVOList, listDict);
if (!errorMsgs.isEmpty()) { if (!errorMsgs.isEmpty()) {
String errorMsg = String.join("<br>", errorMsgs); String errorMsg = "<br>" + String.join("<br>", errorMsgs);
throw new JeroBootException(ResultCommon.MODEL_IMPORT_DATA_ERROR, errorMsg); throw new JeroBootException(ResultCommon.MODEL_IMPORT_DATA_ERROR, errorMsg);
} else {
this.transToDictValue(modelExcelVOList, listDict);
} }
// 转换一下数据
return modelExcelVOList; return modelExcelVOList;
} }
private void transToDictValue(List<ModelExcelVO> list, List<SysDictItemCore> listDict) {
list.forEach(item -> item.setModelState(excelUtils.translateDictValue("model_status", item.getModelState(), listDict)));
}
@Override @Override
public List<String> getDoNotDeleteStandardIdList() { public List<String> getDoNotDeleteStandardIdList() {
List<ProcessStandardComplianceCheck> list = list(); List<ProcessStandardComplianceCheck> list = list();
laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
+1 -1
View File
@@ -618,7 +618,7 @@ public class ExcelUtils {
return ""; return "";
} }
// 检查排查结果 // 检查排查结果
if (!excelUtils.validDict("model_state", value, null, null, true, listDict)) { if (!excelUtils.validDict("model_status", value, null, null, true, listDict)) {
return "'车型状态'无效。"; return "'车型状态'无效。";
} }
return ""; return "";