xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目预算的list展示

Browse Source
This commit is contained in:
chen 2024-07-19 16:50:44 +08:00
parent 13aad0049a
commit 03150899c9
4 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/xqopen/kehui/project/action/ProjectBudgetImplementController.java
View File

@ -39,6 +39,14 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA
try {
Page<ProjectBudgetImplementAddDto> page = new Page<>(projectBudgetImplementFindReq.getPageNo(), projectBudgetImplementFindReq.getPageSize());
List<ProjectBudgetImplementAddDto> list = projectBudgetImplementService.getList(page, projectBudgetImplementFindReq);
for (ProjectBudgetImplementAddDto implementAddDto : list) {
if (!ObjectUtils.isEmpty(implementAddDto.getExecute())){
Double rate =(Integer.parseInt(implementAddDto.getExecute()) /
Integer.parseInt(implementAddDto.getBudget()) *100.0);
implementAddDto.setImplementationRate(String.format("%.2f%%",rate));
}
}
ResultListReqUtil listReq = new ResultListReqUtil();
listReq.setLs(list);
listReq.setTotal(page.getTotal());
@ -114,9 +122,6 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA
if (StringUtils.isEmpty(projectBudgetImplement.getExecute())) {
throw new XQException(ErrorCode.PROJECTINFO_PROJECTCATEGORY_EMPTY_ERROR, null);
}
if (StringUtils.isEmpty(projectBudgetImplement.getImplementationRate())) {
throw new XQException(ErrorCode.PROJECTINFO_PROJECTSTEP_EMPTY_ERROR, null);
}
if (StringUtils.isEmpty(projectBudgetImplement.getProjectId())) {
throw new XQException(ErrorCode.PROJECTINFO_PROJECTSTEP_EMPTY_ERROR, null);
}

2
src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
View File

@ -98,7 +98,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
projectWeekly1.setWeeklyType("0");
projectWeekly1.setProjectId(weekly.getProjectId());
JSONObject ext = projectWeekly1.getExt();
projectWeekly1.setExt((JSONObject) ext.put("userId", String.valueOf(systemUserLogin.getUserinfoId())));
// projectWeekly1.setExt((JSONObject) ext.put("userId", String.valueOf(systemUserLogin.getUserinfoId())));
if(!StringUtils.isEmpty(projectWeeklyFindReq.getId()!=null))projectWeekly1.setId(projectWeeklyFindReq.getId());
if(!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId()!=null))projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId());
list.addAll(projectWeeklyService.getList(page, projectWeekly1));

13
src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
View File

@ -15,8 +15,10 @@ import com.xqopen.kehui.project.dto.ProjectWeeklyAddReq;
import com.xqopen.kehui.project.dto.ProjectWeeklyDto;
import com.xqopen.kehui.project.dto.ProjectWeeklyFindReq;
import com.xqopen.kehui.project.dto.ProjectWeeklyListResp;
import com.xqopen.kehui.project.entity.ProjectBudgetImplement;
import com.xqopen.kehui.project.entity.ProjectInfo;
import com.xqopen.kehui.project.entity.ProjectWeekly;
import com.xqopen.kehui.project.service.IProjectBudgetImplementService;
import com.xqopen.kehui.project.service.IProjectInfoService;
import com.xqopen.kehui.project.service.IProjectWeeklyService;
import com.xqopen.kehui.util.ApiResponse;
@ -41,6 +43,8 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
IProjectInfoService projectInfoService;
@Autowired
ISystemUserLoginService systemUserLoginService;
@Autowired
IProjectBudgetImplementService budgetImplementService;
/**
* 新增周报填报
@ -94,6 +98,15 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
weekly.setCreatedAt(new Timestamp(System.currentTimeMillis()));
projectWeeklyService.insert(weekly);
projectWeekly.setParentId(weekly.getId());
// 添加部门周报时判断项目类型 若为平台专项 则添加项目预算
if (project.getExt().get("openRange").equals(5)){
ProjectBudgetImplement budgetImplement = new ProjectBudgetImplement();
budgetImplement.setWeek(projectWeekly.getWeek());
budgetImplement.setProjectId(projectWeekly.getProjectId());
budgetImplement.setBudget(project.getExt().get("budget").toString());
budgetImplement.setCreatedAt(new Timestamp(System.currentTimeMillis()));
budgetImplementService.insert(budgetImplement);
}
}
//将人事id转为账号id
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();

5
src/main/java/com/xqopen/kehui/project/entity/ProjectBudgetImplement.java
View File

@ -61,6 +61,11 @@ public class ProjectBudgetImplement implements Serializable {
*/
private java.sql.Timestamp updatedAt;
/**
*
*/
private String week;
private static final long serialVersionUID = 1L;