xujun

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

@@ -8,12 +8,9 @@ import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.config.bean.SystemProperties;
 import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.dao.ComProjectDAO;
+import com.yiboshi.science.entity.*;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.*;
-import com.yiboshi.science.entity.ComProject;
-import com.yiboshi.science.entity.ComProjectAudit;
-import com.yiboshi.science.entity.ComUnit;
-import com.yiboshi.science.entity.SystemParameter;
 import com.yiboshi.science.param.query.ComProjectQueryVO;
 import com.yiboshi.science.service.*;
 import com.yiboshi.science.utils.*;
@@ -804,12 +801,33 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
 
     @Transactional
     public String ProjectSaveStep4(ComProjectDTO dto) {
-        ComProject comProject = convert2Entity(dto);
+        ComProject comProject = new ComProject();
+        comProject.setId(dto.getId());
+        comProject.setCompleteStatus(dto.getCompleteStatus());
+        if (Objects.nonNull(dto.getManagerDept()))
+            comProject.setManagerDept(dto.getManagerDept());
+
         this.update(comProject);
 
+        ComProjectBasic comProjectBasic = new ComProjectBasic();
+        comProjectBasic.setProjId(dto.getId());
+        if (Objects.nonNull(dto.getProjAttribute()))
+            comProjectBasic.setProjAttribute(dto.getProjAttribute());
+        else
+            comProjectBasic.setProjAttribute("5b9d6509-aece-11ef-b6cb-0c42a1380f01");//新增项目
+
+        if (Objects.nonNull(dto.getYearTarget()))
+            comProjectBasic.setYearTarget(dto.getYearTarget());
+        if (Objects.nonNull(dto.getYear1Goal()))
+            comProjectBasic.setYear1Goal(dto.getYear1Goal());
+        if (Objects.nonNull(dto.getYear2Goal()))
+            comProjectBasic.setYear2Goal(dto.getYear2Goal());
+        if (Objects.nonNull(dto.getYear3Goal()))
+            comProjectBasic.setYear3Goal(dto.getYear3Goal());
+
         comProjectBasicService.insertOrUpdate(dto);
 
-        if (null != dto.getProjectKPI().getKpiList() || dto.getProjectKPI().getKpiList().size() > 0) {
+        if (null != dto.getProjectKPI().getKpiList() && dto.getProjectKPI().getKpiList().size() > 0) {
             // 项目绩效指标表
             comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), dto.getId());
         }