From 03150899c9d1de46abc0a7d835b2365d62c77727 Mon Sep 17 00:00:00 2001 From: chen <2280784283@qq.com> Date: Fri, 19 Jul 2024 16:50:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E7=AE=97=E7=9A=84li?= =?UTF-8?q?st=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectBudgetImplementController.java | 11 +++++--- .../action/ProjectDepartmentController.java | 2 +- .../action/ProjectWeeklyController.java | 13 +++++++++ .../entity/ProjectBudgetImplement.java | 27 +++++++++++-------- 4 files changed, 38 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectBudgetImplementController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectBudgetImplementController.java index 808bb70..4aecc63 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectBudgetImplementController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectBudgetImplementController.java @@ -39,6 +39,14 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA try { Page page = new Page<>(projectBudgetImplementFindReq.getPageNo(), projectBudgetImplementFindReq.getPageSize()); List 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); } diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java index 5551e80..3695df2 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java @@ -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)); diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java index 8ab977a..d389717 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java @@ -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 userLoginEntityWrapper = new EntityWrapper<>(); diff --git a/src/main/java/com/xqopen/kehui/project/entity/ProjectBudgetImplement.java b/src/main/java/com/xqopen/kehui/project/entity/ProjectBudgetImplement.java index 2896e50..43ae7e0 100644 --- a/src/main/java/com/xqopen/kehui/project/entity/ProjectBudgetImplement.java +++ b/src/main/java/com/xqopen/kehui/project/entity/ProjectBudgetImplement.java @@ -8,62 +8,67 @@ import lombok.Data; import java.io.Serializable; /** - * + * * @TableName project_budget_implement */ @TableName("project_budget_implement") @Data public class ProjectBudgetImplement implements Serializable { /** - * + * */ @TableId(value = "id_", type = IdType.AUTO) private String id; /** - * + * */ private String projectId; /** - * + * */ private String budget; /** - * + * */ private String execute; /** - * + * */ private String implementationRate; /** - * + * */ private String isDeleted; private String createdBy; /** - * + * */ private java.sql.Timestamp createdAt; /** - * + * */ private String updatedBy; /** - * + * */ private java.sql.Timestamp updatedAt; + /** + * + */ + private String week; + private static final long serialVersionUID = 1L; -} \ No newline at end of file +}