jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-04-12 12:46:46 +08:00
parent d280db235a
commit ba6d050b71
2 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 = "计划完工时间")
private String plannedCompletionTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "计划完工时间",dateFormat = "yyyy-MM-dd")
private Date plannedCompletionTime;
/** 计划开始时间 */
@Excel(name = "计划开始时间")
private String scheduledStartTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "计划开始时间",dateFormat = "yyyy-MM-dd")
private Date scheduledStartTime;
/** 实际开始时间 */
@Excel(name = "实际开始时间")
private String actualOperatingTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "实际开始时间",dateFormat = "yyyy-MM-dd")
private Date actualOperatingTime;
/** 实际完工时间 */
@Excel(name = "实际完工时间")
private String actualCompletionTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@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()
{
return plannedCompletionTime;
public Date getScheduledStartTime() {
return scheduledStartTime;
}
public void setScheduledStartTime(String scheduledStartTime)
{
public void setScheduledStartTime(Date scheduledStartTime) {
this.scheduledStartTime = scheduledStartTime;
}
public String getScheduledStartTime()
{
return scheduledStartTime;
public Date getActualOperatingTime() {
return actualOperatingTime;
}
public void setActualOperatingTime(String actualOperatingTime)
{
public void setActualOperatingTime(Date actualOperatingTime) {
this.actualOperatingTime = actualOperatingTime;
}
public String getActualOperatingTime()
{
return actualOperatingTime;
public Date getActualCompletionTime() {
return actualCompletionTime;
}
public void setActualCompletionTime(String actualCompletionTime)
{
public void setActualCompletionTime(Date actualCompletionTime) {
this.actualCompletionTime = actualCompletionTime;
}
public String getActualCompletionTime()
{
return actualCompletionTime;
}
public void setContractAmount(String contractAmount)
public void setContractAmount(String contractAmount)
{
this.contractAmount = contractAmount;
}

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

@ -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);
SysDept sysDept = deptResult.getData();
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);
}
}
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());