更改提示信息

purchase-system/src/main/java/com/ozs/base/service/impl/BaseExpertServiceImpl.java

@@ -330,13 +330,13 @@ public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExp
                 successNum++;
                 successMsg.append(successNum + "、专家【" + expert.getExpertName() + "】导入成功!");
             } catch (Exception exc) {
-                String msg = "**专家【" + expert.getExpertName() + "】导入失败 <br/>";
+                String msg = "      **专家【" + expert.getExpertName() + "】导入失败 <br/>";
                 failureMsg.append(msg);
                 log.error(msg, exc);
             }
         }
         if (failureNum > 0) {
-            failureMsg.insert(0, "导入失败！共 " + failureNum + " 条数据格式不正确：");
+            failureMsg.insert(0, "导入失败！共 " + failureNum + " 条数据格式不正确：   <br/>");
             throw new ServiceException(failureMsg.toString());
         } else {
             successMsg.insert(0, "导入成功！共 " + successNum + " 条。");

purchase-system/src/main/java/com/ozs/base/service/impl/BaseSupplierServiceImpl.java

@@ -83,7 +83,7 @@ public class BaseSupplierServiceImpl extends ServiceImpl<BaseSupplierMapper, Bas
             //供应商名称已存在的不可添加
             if (!ObjectUtils.isEmpty(supplierNameList)) {
                 ++failureNum;
-                failureMsg.append(failureNum + "、供应商名称“" + supplier.getSupplierName() + "”已被使用");
+                failureMsg.append(failureNum + "、供应商名称“" + supplier.getSupplierName() + "”已被使用  <br/>");
             }
             //是否预先采购
             supplier.setSupplierAdvancePurchase(supplier.getSupplierAdvancePurchase().equals("是") ? "1" : "0");
@@ -96,7 +96,7 @@ public class BaseSupplierServiceImpl extends ServiceImpl<BaseSupplierMapper, Bas
             successMsg.append(successNum + "、供应商【" + supplier.getSupplierName() + "】导入成功!");
         }
         if (failureNum > 0) {
-            failureMsg.insert(0, "导入失败！共 " + failureNum + " 条数据格式不正确：");
+            failureMsg.insert(0, "导入失败！共 " + failureNum + " 条数据格式不正确：   <br/>");
             throw new ServiceException(failureMsg.toString());
         } else {
             successMsg.insert(0, "导入成功！共 " + successNum + " 条。");

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -348,7 +348,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                         planQuarter.setPurchaseDeptId(String.valueOf(info.getDeptId()));
                     } else {
                         ++failureNum;
-                        failureMsg.append("*" + failureNum + "*采购单位“" + planQuarter.getPurchaseDeptName() + "”不存在");
+                        failureMsg.append("*" + failureNum + "*采购单位“" + planQuarter.getPurchaseDeptName() + "”不存在   <br/>");
                     }
                     planQuarter.setProjectType(projectTypesMap.get(planQuarter.getProjectType()));
                     planQuarter.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
@@ -374,16 +374,16 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     successMsg.append("*" + successNum + "、项目 " + planQuarter.getProjectName() + " 导入成功!");
                 } else {
                     failureNum++;
-                    failureMsg.append(failureNum + "*项目 " + planQuarter.getProjectName() + " 已存在！/n");
+                    failureMsg.append(failureNum + "*项目 " + planQuarter.getProjectName() + " 已存在！<br/>");
                 }
             } catch (Exception exc) {
-                String msg = "*" + successNum + "*项目 " + planQuarter.getProjectName() + " 导入失败";
+                String msg = "      *" + successNum + "*项目 " + planQuarter.getProjectName() + " 导入失败  <br/>";
                 failureMsg.append(msg);
                 log.error(msg, exc);
             }
         }
         if (failureNum > 0) {
-            failureMsg.insert(0, "导入失败！共 " + failureNum + " 条数据格式不正确：");
+            failureMsg.insert(0, "导入失败！共 " + failureNum + " 条数据格式不正确：   <br/>");
             throw new ServiceException(failureMsg.toString());
         } else {
             successMsg.insert(0, "导入成功！共 " + successNum + " 条。");

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -388,7 +388,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     ofYear.setPurchaseDeptId(String.valueOf(info.getDeptId()));
                 } else {
                     ++failureNum;
-                    failureMsg.append(failureNum + "、采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
+                    failureMsg.append(failureNum + "、采购单位“" + ofYear.getPurchaseDeptName() + "”不存在  <br/>");
                 }
                 //机关业务指导处是多选字段
                 StringBuilder zBuilder = new StringBuilder();
@@ -402,14 +402,14 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 zBuilder.append(infoTow.getId() + ",");
                             } else {
                                 ++failureNum;
-                                failureMsg.append(failureNum + "、机关业务指导处(科)“" + s + "”不存在");
+                                failureMsg.append(failureNum + "、机关业务指导处(科)“" + s + "”不存在   <br/>");
                             }
                         } else {
                             if (!ObjectUtils.isEmpty(infoTow)) {
                                 zBuilder.append(infoTow.getId());
                             } else {
                                 ++failureNum;
-                                failureMsg.append(failureNum + "、机关业务指导处(科)“" + s + "”不存在");
+                                failureMsg.append(failureNum + "、机关业务指导处(科)“" + s + "”不存在   <br/>");
                             }
                         }
                     }
@@ -426,7 +426,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         zBuilder.append(infoTow.getId());
                     } else {
                         ++failureNum;
-                        failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofYear.getOrganDivision() + "”不存在");
+                        failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofYear.getOrganDivision() + "”不存在   <br/>");
                     }
                 }
                 ofYear.setOrganDivision(zBuilder.toString());
@@ -456,13 +456,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 successNum++;
                 successMsg.append(successNum + "、项目【" + ofYear.getProjectName() + "】导入成功!");
             } catch (Exception exc) {
-                String msg = successNum + "、项目【" + ofYear.getProjectName() + "】导入失败";
+                String msg = successNum + "、项目【" + ofYear.getProjectName() + "】导入失败 <br/>";
                 failureMsg.append(msg);
                 log.error(msg, exc);
             }
         }
         if (failureNum > 0) {
-            failureMsg.insert(0, "导入失败！共 " + failureNum + " 条数据格式不正确：");
+            failureMsg.insert(0, "导入失败！共 " + failureNum + " 条数据格式不正确：   <br/>");
             throw new ServiceException(failureMsg.toString());
         } else {
             successMsg.insert(0, "导入成功！共 " + successNum + " 条。");

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -159,14 +159,14 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                                 zBuilder.append(infoTow.getId() + ",");
                             } else {
                                 ++failureNum;
-                                failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");
+                                failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在    <br/>");
                             }
                         } else {
                             if (!ObjectUtils.isEmpty(infoTow)) {
                                 zBuilder.append(infoTow.getId());
                             } else {
                                 ++failureNum;
-                                failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");
+                                failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在    <br/>");
                             }
                         }
                     }
@@ -182,7 +182,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                         zBuilder.append(infoTow.getId());
                     } else {
                         ++failureNum;
-                        failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");
+                        failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在    <br/>");
                     }
                 }
                 ofProvisionalPlan.setOrganDivision(zBuilder.toString());
@@ -213,13 +213,13 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     successMsg.append(successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入成功!");
                 }
             } catch (Exception exc) {
-                String msg = successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入失败；";
+                String msg = successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入失败； <br/>";
                 failureMsg.append(msg);
                 log.error(msg, exc);
             }
         }
         if (failureNum > 0) {
-            failureMsg.insert(0, "导入失败！共 " + failureNum + " 条数据格式不正确：");
+            failureMsg.insert(0, "导入失败！共 " + failureNum + " 条数据格式不正确：   <br/>");
             throw new ServiceException(failureMsg.toString());
         } else {
             successMsg.insert(0, "导入成功！共 " + successNum + " 条。");

purchase-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -508,7 +508,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 SysUser u = userMapper.selectUserByUserName(user.getUserName());
                 if(user.getUserName().equals(PurchaseConfig.getSname())){
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
+                    failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在    <br/>");
                 }else {
                     if (StringUtils.isNull(u))
                     {
@@ -532,7 +532,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     else
                     {
                         failureNum++;
-                        failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
+                        failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在    <br/>");
                     }
                 }