77

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -682,7 +682,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             if (null == project) {
                 dto.setId(projectInsert(dto));
             }
-            projectUpdate(dto, project.getKnowledgeId());
+            projectUpdate(dto);
         }
         return dto.getId();
     }
@@ -692,9 +692,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
     public String projectInsert(ComProjectDTO dto) {
         ComBatchDTO comBatchDTO = comBatchService.getCurrentYearBatchByType(dto.getProjType());
         ComProject comProject = convert2Entity(dto);
-        //comProject.setProjNo(getProjectNo(comBatchDTO.getYear(), "NMWJKJXM"));
-//        if (null != comProject.getKnowledgeId())
-//            comProject.setProjNo(getProjectNo(comBatchDTO.getYear(), systemParameterService.getParameterById(comProject.getKnowledgeId()).getGbCode()));
         comProject.setAppNo(getAppNo());
         comProject.setReportYear(comBatchDTO.getYear());
         comProject.setBatch(comBatchDTO.getBatch());
@@ -709,7 +706,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
 
     @Transactional
     //更新
-    public String projectUpdate(ComProjectDTO dto, String knowledgeId) {
+    public String projectUpdate(ComProjectDTO dto) {
         ComProject project = this.entityById(dto.getId());
         if (null == project)
             throw new BusinessException("项目不存在或已删除");
@@ -720,12 +717,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
                 && !project.getProjState().equals(CommonEnum.projState.returnModify.getCode()))
             throw new BusinessException("项目已上报！");
         ComProject comProject = convert2Entity(dto);
-//        if (null == dto.getProjNo() && null != comProject.getKnowledgeId()) {
-//            comProject.setProjNo(getProjectNo(comProject.getReportYear(), systemParameterService.getParameterById(comProject.getKnowledgeId()).getGbCode()));
-//        }
-//        if (null != knowledgeId && null != comProject.getKnowledgeId() && !knowledgeId.equals(comProject.getKnowledgeId())) {
-//            comProject.setProjNo(getProjectNo(comProject.getReportYear(), systemParameterService.getParameterById(comProject.getKnowledgeId()).getGbCode()));
-//        }
         this.saveList(dto,dto.getId());
         comProjectBasicService.insertOrUpdate(dto);
         return this.update(comProject);