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

fix: 企标导入

Browse Source
This commit is contained in:
mzaxd
2024-07-24 21:59:16 +08:00
parent adf831278f
commit 1c9442a583
3 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+9 -11
View File
@@ -157,8 +157,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
@Resource @Resource
private ILawsPartNameService partNameService; private ILawsPartNameService partNameService;
@Resource @Resource
private ISysDepartService departService;
@Resource
private ISysUserService sysUserRoleService; private ISysUserService sysUserRoleService;
@Resource @Resource
private ILawsPartNameStandardService partNameStandardService; private ILawsPartNameStandardService partNameStandardService;
@@ -1736,15 +1734,15 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
} }
} }
// 如果是企标的话手动添加稽查内容字段 // 如果是企标的话手动添加稽查内容字段
// if (TableNameEnum.ENTERPRISE_STANDARDS.getTableName().equals(tableName)) { if (TableNameEnum.ENTERPRISE_STANDARDS.getTableName().equals(tableName)) {
// LawsTag inspectContentTag = new LawsTag(); LawsTag inspectContentTag = new LawsTag();
// inspectContentTag.setDbFieldTxt("稽查内容"); inspectContentTag.setDbFieldTxt("稽查内容");
// inspectContentTag.setFieldShowType(FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue()); inspectContentTag.setFieldShowType(FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue());
// inspectContentTag.setDbFieldName(FieldCommon.CHECK_LIST); inspectContentTag.setDbFieldName(FieldCommon.CHECK_LIST);
// inspectContentTag.setFieldMustInput(YesOrNoEnum.NO.getValue()); inspectContentTag.setFieldMustInput(YesOrNoEnum.NO.getValue());
// headerList.remove(headerList.size() - 1); headerList.remove(headerList.size() - 1);
// headerList.add(inspectContentTag); headerList.add(inspectContentTag);
// } }
// 获取错误信息 // 获取错误信息
errMsgList = importUtil.validExcelData(sheet, headerList, fileMap, insertDataList, errMsgList = importUtil.validExcelData(sheet, headerList, fileMap, insertDataList,
treeNodeMap, treeNodePathMap, treeNodeMap, treeNodePathMap,
laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+13 -22
View File
@@ -188,7 +188,7 @@ public class ImportUtil {
if (FieldCommon.STANDARD_NUMBER.equals(tag.getDbFieldName())) { if (FieldCommon.STANDARD_NUMBER.equals(tag.getDbFieldName())) {
if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(tag.getIsModel())) { if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(tag.getIsModel())) {
// 使用正则表达式进行基础的格式验证 // 使用正则表达式进行基础的格式验证
if (!cellValue.matches("^[A-Z]{1,2}/[A-Z]{2} [0-9A-HJ-Z]\\d{4}-\\d{4}$")) { if (!cellValue.matches("^[A-Z]{1,2}/[A-Z]{2,} [A-Z]\\d+-\\d{3}-\\d{4}$")) {
log.error("第" + row + "列输入的" + tag.getDbFieldTxt() + "格式不正确 "); log.error("第" + row + "列输入的" + tag.getDbFieldTxt() + "格式不正确 ");
errMsg.append("第").append(row).append("列输入的").append(tag.getDbFieldTxt()).append("格式不正确 "); errMsg.append("第").append(row).append("列输入的").append(tag.getDbFieldTxt()).append("格式不正确 ");
} else { } else {
@@ -208,7 +208,7 @@ public class ImportUtil {
String yearCode = secondPartElements[1]; String yearCode = secondPartElements[1];
// 从标准类别代号和顺序号字符串中分离出标准类别代号和顺序号 // 从标准类别代号和顺序号字符串中分离出标准类别代号和顺序号
String categoryCode = categoryAndSequence.substring(0, 1); String categoryCode = secondPartElements[0];
// 转成字典值并存入 // 转成字典值并存入
parameterMap.put(FieldCommon.ENTERPRISE_STANDARD_CODE, this.convertDictValue("enterprise_standard_code", enterpriseStandardCode)); parameterMap.put(FieldCommon.ENTERPRISE_STANDARD_CODE, this.convertDictValue("enterprise_standard_code", enterpriseStandardCode));
@@ -359,14 +359,6 @@ public class ImportUtil {
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误,多选时间格式为yyyy-MM-dd,yyyy-MM-dd "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误,多选时间格式为yyyy-MM-dd,yyyy-MM-dd ");
} }
} }
// 多选标准弹框
if (FieldShowTypeEnum.MULTI_STANDARD_DIALOG.getValue().equals(tag.getFieldShowType())) {
// 需求更改 不校验
// if (!this.multiStandardValid(cellValue, tag.getIsModel())) {
// log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
// errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
// }
}
// 单选时间 // 单选时间
if (FieldShowTypeEnum.YEAR_SELECT.getValue().equals(tag.getFieldShowType())) { if (FieldShowTypeEnum.YEAR_SELECT.getValue().equals(tag.getFieldShowType())) {
if (!this.yearValid(cellValue)) { if (!this.yearValid(cellValue)) {
@@ -392,17 +384,16 @@ public class ImportUtil {
parameterMap.put(tag.getDbFieldName(), cellValue); parameterMap.put(tag.getDbFieldName(), cellValue);
// 企标稽查内容文件导入 // 企标稽查内容文件导入
// if (FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue().equals(tag.getFieldShowType())) { if (FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue().equals(tag.getFieldShowType())) {
// if (!this.inspectContentFileValid(cellValue, fileMap)) { if (!this.inspectContentFileValid(cellValue, fileMap)) {
// cellValue = null; log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
// log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
// errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); } else {
// } else { // 转为List
// // 转为List // 将转好的值加入Map
// // 将转好的值加入Map parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap));
// parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap)); }
// } }
// }
} }
if (errMsg.toString().contains("列") || errMsg.toString().contains("重复") || errMsg.toString().contains("已存在")) { if (errMsg.toString().contains("列") || errMsg.toString().contains("重复") || errMsg.toString().contains("已存在")) {
errMsgList.add(errMsg.toString()); errMsgList.add(errMsg.toString());
@@ -553,7 +544,7 @@ public class ImportUtil {
checkList.add(inspectContentMap); checkList.add(inspectContentMap);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error(e.getMessage());
} }
return checkList; return checkList;
} }
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java
+1 -1
View File
@@ -265,7 +265,7 @@ public class LawsEnterpriseController {
@RequiresPermissions("enterpriseStandard:upload") @RequiresPermissions("enterpriseStandard:upload")
public Result<?> importExcelWithData(@RequestParam("file") @ApiParam("上传的文件") MultipartFile file) { public Result<?> importExcelWithData(@RequestParam("file") @ApiParam("上传的文件") MultipartFile file) {
List<String> errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); List<String> errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue());
if (errorMessages.size() > 0) { if (!errorMessages.isEmpty()) {
return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), errorMessages); return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), errorMessages);
} }
return Result.OK(); return Result.OK();