Browse Source

fix: 药店/商业公司/医院批量导入-校验调整

lixuesong 1 năm trước cách đây
mục cha
commit
f2ed0f891c

+ 49 - 13
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDistributionServiceImpl.java

@@ -776,6 +776,54 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 				errorMap(errorMap, "名称已存在", excelModel.getNumber());
 			}
 
+			// 统一社会信用代码
+			if (StrUtil.isBlank(excelModel.getCode())) {
+				log.error("统一社会信用代码为空");
+				errorMap(errorMap, "统一社会信用代码为空", excelModel.getNumber());
+			} else {
+				distribution.setShyshxydm(excelModel.getCode());
+			}
+
+			// 公司注册地
+			if (StrUtil.isBlank(excelModel.getRegisteredAddress())) {
+				log.error("公司注册地为空");
+				errorMap(errorMap, "公司注册地为空", excelModel.getNumber());
+			} else {
+				distribution.setGszcd(excelModel.getRegisteredAddress());
+			}
+
+			// 注册资本
+			if (StrUtil.isBlank(excelModel.getRegisteredCapital())) {
+				log.error("注册资本为空");
+				errorMap(errorMap, "注册资本为空", excelModel.getNumber());
+			} else {
+				distribution.setZczb(excelModel.getRegisteredCapital());
+			}
+
+			// GSP证书编号
+			if (StrUtil.isBlank(excelModel.getCertificateNumber())) {
+				log.error("GSP证书编号为空");
+				errorMap(errorMap, "GSP证书编号为空", excelModel.getNumber());
+			} else {
+				distribution.setGspzsbh(excelModel.getCertificateNumber());
+			}
+
+			// 法定代表人
+			if (StrUtil.isBlank(excelModel.getLegalRepresentative())) {
+				log.error("法定代表人为空");
+				errorMap(errorMap, "法定代表人为空", excelModel.getNumber());
+			} else {
+				distribution.setFrdb(excelModel.getLegalRepresentative());
+			}
+
+			// 药品信息化追溯体系
+			if (StrUtil.isBlank(excelModel.getMedicineTraceability())) {
+				log.error("药品信息化追溯体系为空");
+				errorMap(errorMap, "药品信息化追溯体系为空", excelModel.getNumber());
+			} else {
+				distribution.setMedicineTraceability(excelModel.getMedicineTraceability());
+			}
+
 			// 记录正确的结果
 			LocalDateTime now = LocalDateTime.now();
 			distribution.setCreateTime(now);
@@ -790,20 +838,8 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 				distribution.setCity(latAndLng.getCity());
 				distribution.setArea(latAndLng.getArea());
 			}
-			// 公司名称
+			// 公司规模
 			distribution.setGsgm(excelModel.getSize());
-			// 统一社会信用代码
-			distribution.setShyshxydm(excelModel.getCode());
-			// 公司注册地
-			distribution.setGszcd(excelModel.getRegisteredAddress());
-			// 注册资本
-			distribution.setZczb(excelModel.getRegisteredCapital());
-			// GSP证书编号
-			distribution.setGspzsbh(excelModel.getCertificateNumber());
-			// 法定代表人
-			distribution.setFrdb(excelModel.getLegalRepresentative());
-			// 药品信息化追溯体系
-			distribution.setMedicineTraceability(excelModel.getMedicineTraceability());
 			// 追溯体系介绍
 			distribution.setMedicineTraceabilityOther(excelModel.getMedicineTraceabilityDesc());
 			// 公司简介