77

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

@@ -724,13 +724,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
     private String ProjectSaveStep0(ComProjectDTO dto) {
         String ProjectID = "";
         dto.setFileId(dto.getDownloadId());
-        if (Objects.nonNull(dto.getGovFunding())) {
-            if (dto.getGovFunding().compareTo(new BigDecimal(50)) > -1) {
-                dto.setProjClass(2);
-            } else {
-                dto.setProjClass(1);
-            }
-        }
         if (Objects.isNull(dto.getId()))
             ProjectID = InsertProjectBaseInfo(dto);
         else {
@@ -759,6 +752,13 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
 
     @Transactional
     public String ProjectSaveStep2(ComProjectDTO dto) {
+        if (Objects.nonNull(dto.getGovFunding())) {
+            if (dto.getGovFunding().compareTo(new BigDecimal(50)) > -1) {
+                dto.setProjClass(2);
+            } else {
+                dto.setProjClass(1);
+            }
+        }
         ComProject comProject = convert2Entity(dto);
         this.update(comProject);
 
@@ -1019,13 +1019,12 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
     /**
      * 获取项目编号
      *
-     * @param year          项目申报年度
-     * @param knowledgeCode 学科代码
+     * @param year 项目申报年度
+     * @param code 学科代码
      * @return
      */
-    private String getProjectNo(int year, String knowledgeCode) {
-//        return year + "-" + knowledgeCode + comProjectDAO.getProjectNo(year + "-" + knowledgeCode);
-        return year + knowledgeCode + comProjectDAO.getProjectNo(year + knowledgeCode);
+    private String getProjectNo(int year, String code) {
+        return year + code + comProjectDAO.getProjectNo(year + code);
     }
 
     /**