提交代码

yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java

@@ -1,10 +1,12 @@
 package com.yanzhu.manage.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yanzhu.common.core.annotation.Excel;
 import com.yanzhu.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -171,20 +173,24 @@ public class ProProjectInfo extends BaseEntity
     private String totalOutputValue;
 
     /** 计划完工时间 */
-    @Excel(name = "计划完工时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String plannedCompletionTime;
+    @Excel(name = "计划完工时间",dateFormat = "yyyy-MM-dd")
+    private Date plannedCompletionTime;
 
     /** 计划开始时间 */
-    @Excel(name = "计划开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String scheduledStartTime;
+    @Excel(name = "计划开始时间",dateFormat = "yyyy-MM-dd")
+    private Date scheduledStartTime;
 
     /** 实际开始时间 */
-    @Excel(name = "实际开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String actualOperatingTime;
+    @Excel(name = "实际开始时间",dateFormat = "yyyy-MM-dd")
+    private Date actualOperatingTime;
 
     /** 实际完工时间 */
-    @Excel(name = "实际完工时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String actualCompletionTime;
+    @Excel(name = "实际完工时间",dateFormat = "yyyy-MM-dd")
+    private Date actualCompletionTime;
 
     /** 合同总金额 */
     @Excel(name = "合同总金额")
@@ -405,43 +411,40 @@ public class ProProjectInfo extends BaseEntity
     {
         return totalOutputValue;
     }
-    public void setPlannedCompletionTime(String plannedCompletionTime) 
+
-    {
+    public Date getPlannedCompletionTime() {
+        return plannedCompletionTime;
+    }
+
+    public void setPlannedCompletionTime(Date plannedCompletionTime) {
         this.plannedCompletionTime = plannedCompletionTime;
     }
 
-    public String getPlannedCompletionTime() 
+    public Date getScheduledStartTime() {
-    {
+        return scheduledStartTime;
-        return plannedCompletionTime;
     }
-    public void setScheduledStartTime(String scheduledStartTime) 
+
-    {
+    public void setScheduledStartTime(Date scheduledStartTime) {
         this.scheduledStartTime = scheduledStartTime;
     }
 
-    public String getScheduledStartTime() 
+    public Date getActualOperatingTime() {
-    {
+        return actualOperatingTime;
-        return scheduledStartTime;
     }
-    public void setActualOperatingTime(String actualOperatingTime) 
+
-    {
+    public void setActualOperatingTime(Date actualOperatingTime) {
         this.actualOperatingTime = actualOperatingTime;
     }
 
-    public String getActualOperatingTime() 
+    public Date getActualCompletionTime() {
-    {
+        return actualCompletionTime;
-        return actualOperatingTime;
     }
-    public void setActualCompletionTime(String actualCompletionTime) 
+
-    {
+    public void setActualCompletionTime(Date actualCompletionTime) {
         this.actualCompletionTime = actualCompletionTime;
     }
 
-    public String getActualCompletionTime() 
+    public void setContractAmount(String contractAmount)
-    {
-        return actualCompletionTime;
-    }
-    public void setContractAmount(String contractAmount) 
     {
         this.contractAmount = contractAmount;
     }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java

@@ -29,6 +29,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
 import java.io.File;
@@ -139,6 +140,7 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertProProjectInfo(ProProjectInfo proProjectInfo)
     {
         R<SysDept> deptResult = remoteDeptService.getDeptInfo(proProjectInfo.getDisDeptId(), SecurityConstants.INNER);
@@ -256,6 +258,7 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateProProjectInfo(ProProjectInfo proProjectInfo)
     {
         if(StringUtils.isEmpty(proProjectInfo.getProjectQrCode())){
@@ -276,34 +279,31 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService
         }
         proProjectInfo.setUpdateTime(DateUtils.getNowDate());
         proProjectInfo.setUpdateBy(SecurityContextHolder.getUserName());
-        List<ProProjectInfoDepts> depts = proProjectInfo.getProjectDeptsList();
-        if(depts!=null){
-            depts.forEach(dept->{
-                dept.setProjectId(proProjectInfo.getId());
-                if(dept.getId()!=null){
-                    deptsMapper.updateProProjectInfoDepts(dept);
-                }else{
-                    deptsMapper.insertProProjectInfoDepts(dept);
-                }
-            });
-        }
-        ProProjectInfoSetting setting = proProjectInfo.getSetting();
-        if(setting!=null){
-            setting.setProjectId(proProjectInfo.getId());
-            if(setting.getId()!=null){
-                settingMapper.updateProProjectInfoSetting(setting);
-            }else{
-                settingMapper.insertProProjectInfoSetting(setting);
-            }
-        }
         int res = proProjectInfoMapper.updateProProjectInfo(proProjectInfo);
         if(res>0){
-            R<SysDept> deptResult = remoteDeptService.getDeptInfo(proProjectInfo.getDisDeptId(), SecurityConstants.INNER);
+            List<ProProjectInfoDepts> depts = proProjectInfo.getProjectDeptsList();
-            SysDept sysDept = deptResult.getData();
+            if(depts!=null){
+                depts.forEach(dept->{
+                    dept.setProjectId(proProjectInfo.getId());
+                    if(dept.getId()!=null){
+                        deptsMapper.updateProProjectInfoDepts(dept);
+                    }else{
+                        deptsMapper.insertProProjectInfoDepts(dept);
+                    }
+                });
+            }
+            ProProjectInfoSetting setting = proProjectInfo.getSetting();
+            if(setting!=null){
+                setting.setProjectId(proProjectInfo.getId());
+                if(setting.getId()!=null){
+                    settingMapper.updateProProjectInfoSetting(setting);
+                }else{
+                    settingMapper.insertProProjectInfoSetting(setting);
+                }
+            }
+
             ProDept proDept = new ProDept();
             proDept.setDeptId(proProjectInfo.getId());
-            proDept.setParentId(proProjectInfo.getDisDeptId());
-            proDept.setAncestors(sysDept.getAncestors()+","+proProjectInfo.getDisDeptId());
             proDept.setDeptName(proProjectInfo.getProjectName());
             proDept.setDeptShortName(proProjectInfo.getSimpleName());
             proDept.setLeader(proProjectInfo.getProjectPerson());