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

新增个人周报功能完善

Browse Source
This commit is contained in:
chen 2024-07-30 15:17:14 +08:00
parent 1d5acd6199
commit b3293196fc
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,9 @@ import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Slf4j
@ -55,6 +57,11 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA
implementAddDto.setImplementationRate(String.format("%.2f%%",rate));
}
// 修改日期格式
/* Timestamp updatedAt = implementAddDto.getUpdatedAt();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String format= sdf.format(updatedAt);
implementAddDto.setUpdatedAt();*/
}
//向listReq中加入财务专员id
EntityWrapper<SystemUserRole> userRole = new EntityWrapper<>();

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

@ -277,13 +277,10 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
ProjectWeekly projectWeekly = new ProjectWeekly();
projectWeekly.setProjectId(String.valueOf(project.getId()));
//将项目专员和项目负责人id 存入Weekly中
JSONObject extInfo = project.getExt();
JSONArray projectManagerData = extInfo.getJSONArray("projectManagerData");
JSONArray projectAdmin = extInfo.getJSONArray("projectAdmin");
JSONObject ext = projectWeekly.getExt();
ext.put("projectManagerData",projectManagerData.getString(projectManagerData.toArray().length -1 ));
ext.put("projectAdmin",projectAdmin.getString(projectAdmin.toArray().length -1 ));
ext.put("draftManId",extInfo.getString("draftManId"));
JSONObject ext = getExt(project,projectInfoReq);
ext.put("projectNo",projectNo);
ext.put("projectName",projectName);
projectWeekly.setExt(ext);
//新增个人周报填报时，判断相应的部门周报是否存在，否则添加
EntityWrapper<ProjectWeekly> weeklyEntityWrapper = new EntityWrapper<>();
@ -317,10 +314,13 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
projectWeekly.setParentId(weekly.getId());
}
// 添加个人周报
projectWeekly.setUserId(projectInfoReq.getExt().get("draftManId").toString());
projectWeekly.setUserId(userId.toString());
projectWeekly.setDeptId(projectInfoReq.getExt().getJSONArray("executeDepts").getString(0));
projectWeekly.setWorkload(list.getWorkload());
projectWeekly.setWeek(list.getWeek());
projectWeekly.setThisWeek(list.getThisWeek());
projectWeekly.setNextWeek(list.getNextWeek());
projectWeekly.setCreatedBy(projectInfoReq.getExt().get("draftManId").toString());
projectWeekly.setCreatedBy(userId.toString());
projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis()));
projectWeeklyService.insert(projectWeekly);
}
@ -335,5 +335,18 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
}
}
private JSONObject getExt(ProjectInfo project,ProjectInfoReq projectInfoReq) {
JSONObject extInfo = project.getExt();
JSONArray projectManagerData = extInfo.getJSONArray("projectManagerData");
JSONArray projectAdmin = extInfo.getJSONArray("projectAdmin");
JSONObject ext = new JSONObject();
ext.put("projectManagerData",projectManagerData.getString(projectManagerData.toArray().length -1 ));
ext.put("projectAdmin",projectAdmin.getString(projectAdmin.toArray().length -1 ));
ext.put("draftManId",extInfo.getString("draftManId"));
ext.put("deptName",projectInfoReq.getExt().get("draftDeptName"));
ext.put("userName",projectInfoReq.getExt().get("draftMan"));
return ext;
}
}