|
|
@@ -56,22 +56,34 @@ public class ManHourServiceImpl implements ManHourService {
|
|
|
|
|
|
@Override
|
|
|
public ResMsg findManHourAll(Integer pageIndex, Integer pageSize, ManHourInfoEntity manHourInfoEntity) {
|
|
|
+ //拿到用户的ID，只查询与本人有关的工时
|
|
|
+ String userId = TokenData.takeFromRequest().getUserId();
|
|
|
Pageable page = PageRequest.of(pageIndex - 1, pageSize);
|
|
|
String endDate = null;
|
|
|
if (manHourInfoEntity.getEndDate() != null) {
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
endDate = dateFormat.format(manHourInfoEntity.getEndDate()) + " 23:59:59";
|
|
|
}
|
|
|
-
|
|
|
- Page<Map<String, String>> manHourAll = manHourMapper.findManHourAll(manHourInfoEntity.getFlowTaskStatus(), manHourInfoEntity.getCreateDate(), endDate, page);
|
|
|
+ Page<Map<String, String>> manHourAll = manHourMapper.findManHourAll(userId, manHourInfoEntity.getFlowTaskStatus(), manHourInfoEntity.getCreateDate(), endDate, page);
|
|
|
+ //匹配工时信息和项目信息
|
|
|
+ List<ManHourJobInfo> jobInfos = manHourJobMapper.findAll();
|
|
|
+ List<ProjectInfoEntity> projectInfos = projectInfoMapper.findAll();
|
|
|
return new ResMsg(CodeEnum.OK, ResMsg.getMap(manHourAll.map(map -> {
|
|
|
Map<Object, Object> map1 = new HashMap<>(map);
|
|
|
String projectId = map.get("projectName");
|
|
|
map1.put("manHour", map.get("manHour") + "天");
|
|
|
- List<ManHourJobInfo> byManIdIs = manHourJobMapper.findManHourJobInfosByManIdIs(Integer.valueOf(map1.get("manId").toString()));
|
|
|
- map1.put("manHourJob", byManIdIs);
|
|
|
- Optional<ProjectInfoEntity> byId = projectInfoMapper.findById(Integer.valueOf(projectId));
|
|
|
- map1.put("projectName", byId.orElse(null) != null ? byId.orElse(null).getProjectName() : null);
|
|
|
+ for (ManHourJobInfo jobInfo : jobInfos) {
|
|
|
+ if (jobInfo.getManId().equals(Integer.valueOf(map1.get("manId").toString()))) {
|
|
|
+ map1.put("manHourJob", jobInfo);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for (ProjectInfoEntity projectInfo : projectInfos) {
|
|
|
+ if (Integer.valueOf(projectId).equals(projectInfo.getProjectId())) {
|
|
|
+ map1.put("projectName", projectInfo.getProjectName());
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
return map1;
|
|
|
}).getContent(), manHourAll.getTotalElements()));
|
|
|
}
|
|
|
@@ -110,7 +122,7 @@ public class ManHourServiceImpl implements ManHourService {
|
|
|
stringObjectHashMap.put("create_date", manHourInfoEntity.getCreateDate());
|
|
|
stringObjectHashMap.put("create_user", manHourInfoEntity.getCreateUser());
|
|
|
ManHourInfoEntity save = manHourMapper.save(manHourInfoEntity);
|
|
|
- stringObjectHashMap.put("man_id",save.getManId());
|
|
|
+ stringObjectHashMap.put("man_id", save.getManId());
|
|
|
JSONObject masterData = (JSONObject) JSONObject.toJSON(stringObjectHashMap);
|
|
|
Map<String, String> map = flowTaskStart.startAndTakeUserTaskSS(processDefinitionKey, flowTaskCommentDto, null, masterData, null, null).getData();
|
|
|
manHourInfoEntity.setProcessInstanceId(map.get("processInstanceId"));
|
|
|
@@ -145,15 +157,9 @@ public class ManHourServiceImpl implements ManHourService {
|
|
|
public ResMsg findManHourByID(Integer manId) {
|
|
|
Optional<ManHourInfoEntity> byId = manHourMapper.findById(manId);
|
|
|
List<ManHourJobInfo> byManIdIs = manHourJobMapper.findManHourJobInfosByManIdIs(manId);
|
|
|
- //ObjectMapper objectMapper = new ObjectMapper();
|
|
|
- //String json = new String();
|
|
|
- //try {
|
|
|
- // json = objectMapper.writeValueAsString(byManIdIs);
|
|
|
- //} catch (JsonProcessingException e) {
|
|
|
- // e.printStackTrace();
|
|
|
- //}
|
|
|
byId.get().setManHourJob(byManIdIs);
|
|
|
return new ResMsg(CodeEnum.OK, byId);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
}
|
buzhanyi