|
@@ -111,7 +111,8 @@ public class ManHourServiceImpl implements ManHourService {
|
|
|
stringObjectHashMap.put("man_hour", "总计**时");
|
|
|
stringObjectHashMap.put("create_date", manHourInfoEntity.getCreateDate());
|
|
|
stringObjectHashMap.put("create_user", manHourInfoEntity.getCreateUser());
|
|
|
- stringObjectHashMap.put("man_id", manHourInfoEntity.getManId());
|
|
|
+ ManHourInfoEntity save = manHourMapper.save(manHourInfoEntity);
|
|
|
+ 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"));
|
|
@@ -123,7 +124,7 @@ public class ManHourServiceImpl implements ManHourService {
|
|
|
}
|
|
|
manHourInfoEntity.setManHour(day);
|
|
|
manHourInfoEntity.setCreateTime(new Date());
|
|
|
- ManHourInfoEntity save = manHourMapper.save(manHourInfoEntity);
|
|
|
+ ManHourInfoEntity save1 = manHourMapper.save(manHourInfoEntity);
|
|
|
for (ManHourJobInfo manHour : manHours) {
|
|
|
manHour.setManId(save.getManId());
|
|
|
manHourJobMapper.save(manHour);
|