修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectApprovalController.java

@@ -95,18 +95,39 @@ public class ProjectApprovalController {
             projectApproval.setCreateDate(LocalDate.now());
             projectApproval.setCreatorId(user.getId());
         }
+        //新增操作记录数据
+        ProjectApprovalLog projectApprovalLog=new ProjectApprovalLog();
+        projectApprovalLog.setCreateTime(LocalDateTime.now());
+        projectApprovalLog.setUserName(user.getName());
+        if(projectApproval.getId()==null){
+            //提交
+            projectApprovalLog.setType(0);
+        }else {
+            //编辑
+            projectApprovalLog.setType(1);
+        }
         Optional<ProjectCategory> category = categoryList.stream().filter(c -> c.getId().equals(projectApproval.getCategory())).findFirst();
         if(category.isPresent()){
             projectApproval.setCategoryName(category.get().getName());
         }
-        Integer count=projectMapper.selectCount(new LambdaQueryWrapper<Project>().eq(Project::getCompanyId, companyId).eq(Project::getProjectCode, projectApproval.getProjectCode()));
-        if(count>0){
-            msg.setError("已存在项目编号为["+projectApproval.getProjectCode()+"]的项目");
-            return msg;
+        if(projectApproval.getInchargerId()!=null){
+            User id = userMapper.selectById(projectApproval.getInchargerId());
+            projectApproval.setInchargerName(id.getName());
+        }
+        if(!StringUtils.isEmpty(projectApproval.getProjectCode())){
+            Integer count=projectMapper.selectCount(new LambdaQueryWrapper<Project>().eq(Project::getCompanyId, companyId).eq(Project::getProjectCode, projectApproval.getProjectCode()));
+            Integer count1=projectApprovalService.count(new LambdaQueryWrapper<ProjectApproval>().eq(ProjectApproval::getCompanyId, companyId).eq(ProjectApproval::getProjectCode, projectApproval.getProjectCode()));
+            if(count>0||count1>0){
+                msg.setError("已存在项目编号为["+projectApproval.getProjectCode()+"]的项目/立项");
+                return msg;
+            }
         }
         if(!projectApprovalService.saveOrUpdate(projectApproval)){
             msg.setError("验证失败");
+            return msg;
         }
+        projectApprovalLog.setProjectApprovalId(projectApproval.getId());
+        projectApprovalLogService.save(projectApprovalLog);
         participationApprovalService.remove(new LambdaQueryWrapper<ParticipationApproval>().eq(ParticipationApproval::getProjectApprovalId,projectApproval.getId()));
         projectApprovalBasecostService.remove(new LambdaQueryWrapper<ProjectApprovalBasecost>().eq(ProjectApprovalBasecost::getProjectApprovalId,projectApproval.getId()));
         projectApprovalAuditorService.remove(new LambdaQueryWrapper<ProjectApprovalAuditor>().eq(ProjectApprovalAuditor::getProjectApprovalId,projectApproval.getId()));
@@ -239,19 +260,6 @@ public class ProjectApprovalController {
                 }
             }
         }
-        //新增操作记录数据
-        ProjectApprovalLog projectApprovalLog=new ProjectApprovalLog();
-        projectApprovalLog.setCreateTime(LocalDateTime.now());
-        projectApprovalLog.setProjectApprovalId(projectApproval.getId());
-        projectApprovalLog.setUserName(user.getName());
-        if(projectApproval.getId()==null){
-            //提交
-            projectApprovalLog.setType(0);
-        }else {
-            //编辑
-            projectApprovalLog.setType(1);
-        }
-        projectApprovalLogService.save(projectApprovalLog);
         return msg;
     }
 

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

@@ -423,6 +423,14 @@ public class ProjectApprovalServiceImpl extends ServiceImpl<ProjectApprovalMappe
                     projectApprovalMapper.updateById(project);
                 }else {
                     projectApprovalMapper.insert(project);
+                    //增加操作记录
+                    //新增操作记录数据
+                    ProjectApprovalLog projectApprovalLog=new ProjectApprovalLog();
+                    projectApprovalLog.setCreateTime(LocalDateTime.now());
+                    projectApprovalLog.setProjectApprovalId(project.getId());
+                    projectApprovalLog.setUserName(user.getName());
+                    projectApprovalLog.setType(0);
+                    projectApprovalLogService.save(projectApprovalLog);
                 }
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     //更新审核人 发送到企业微信完成审核动作
@@ -695,11 +703,10 @@ public class ProjectApprovalServiceImpl extends ServiceImpl<ProjectApprovalMappe
                     }
                 }
             }
-            //msg.data = "成功导入"+importCount+"条数据。";
             msg.data = MessageUtils.message("data.importSucRow",importCount);
             if (existCodeList.size() > 0) {
                 String collect = existCodeList.stream().collect(Collectors.joining(","));
-                msg.data += MessageUtils.message("data.upSkip",existCodeList.size(),collect);
+                msg.data += MessageUtils.message("data.skip",existCodeList.size(),collect);
             }
         } catch (Exception e) {
             e.printStackTrace();