系统基础设置中增加可补填前1天日报 前端修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectPercentageServiceImpl.java

@@ -229,18 +229,31 @@ public class ProjectPercentageServiceImpl extends ServiceImpl<ProjectPercentageM
                         dataString+=dataStringOne+"]";
                     }
                     if(s!=100){
-                        msg.setError("分摊比例错误,不满足100%");
+                        msg.setError("人员["+username+"]"+"分摊比例错误,不满足100%,请检查");
                         return msg;
                     }
                 }
             }
+            ProjectPercentage percentageServiceOne = projectPercentageService.getOne(new QueryWrapper<ProjectPercentage>().eq("company_id", companyId));
+            if(percentageServiceOne.getData().equals(dataString)){
+                msg.setError("请勿导入重复数据");
+                return msg;
+            }
             ProjectPercentage projectPercentage=new ProjectPercentage();
-            projectPercentage.setId(null);
-            projectPercentage.setYmonth(df.format(new Date()));
-            projectPercentage.setData(dataString);
-            projectPercentage.setCompanyId(companyId);
-            System.out.println(projectPercentage);
-            projectPercentageService.save(projectPercentage);
+            //检查是否已经存在分摊数据
+            if(percentageServiceOne!=null){
+                projectPercentage.setId(percentageServiceOne.getId());
+                projectPercentage.setYmonth(df.format(new Date()));
+                projectPercentage.setData(dataString);
+                projectPercentage.setCompanyId(companyId);
+                projectPercentageService.updateById(projectPercentage);
+            }else{
+                projectPercentage.setId(null);
+                projectPercentage.setYmonth(df.format(new Date()));
+                projectPercentage.setData(dataString);
+                projectPercentage.setCompanyId(companyId);
+                projectPercentageService.save(projectPercentage);
+            }
             msg.data=dataCount;
             return msg;
         }catch (IOException e){