| | |
| | | task.setPlannedStartTime(createVO.getPlannedStartTime()); |
| | | task.setPlannedEndTime(createVO.getPlannedEndTime()); |
| | | task.setAssigneeId(createVO.getAssigneeId()); |
| | | |
| | | task.setCreatorId(userId); |
| | | // 优先使用前端传入的部门ID,如果没有则使用当前用户的部门ID |
| | | task.setDeptId(createVO.getDeptId() != null ? createVO.getDeptId() : SecurityUtils.getDeptId()); |
| | |
| | | task.setRemark(createVO.getRemark()); |
| | | task.setDelFlag("0"); |
| | | |
| | | task.setIsHeadPush(isTaskHeaderPush(userId,task.getDeptId())?"1":"0"); |
| | | // task.setIsHeadPush(isTaskHeaderPush(userId,task.getDeptId())?"1":"0"); |
| | | |
| | | // 设置地址和坐标信息 |
| | | setAddressAndCoordinatesFromVO(task, createVO); |
| | |
| | | task.setRemark(createVO.getRemark()); |
| | | task.setDelFlag("0"); |
| | | |
| | | Boolean isHeadPush=this.isTaskHeaderPush(userId, deptId); |
| | | if(isHeadPush){ |
| | | task.setIsHeadPush("1"); |
| | | }else{ |
| | | task.setIsHeadPush("0"); |
| | | } |
| | | // Boolean isHeadPush=this.isTaskHeaderPush(userId, deptId); |
| | | // if(isHeadPush){ |
| | | // task.setIsHeadPush("1"); |
| | | // }else{ |
| | | // task.setIsHeadPush("0"); |
| | | // } |
| | | |
| | | |
| | | |
| | |
| | | } |
| | | Boolean hasSetDepartureFlag=false; |
| | | //设置总部推送 |
| | | task.setIsHeadPush(this.isTaskHeaderPush(task.getCreatorId(), task.getDeptId())?"1":"0"); |
| | | // task.setIsHeadPush(this.isTaskHeaderPush(task.getCreatorId(), task.getDeptId())?"1":"0"); |
| | | // 自动获取出发地GPS坐标(如果更新了地址但缺失坐标) |
| | | if (updateVO.getDepartureAddress() != null && |
| | | (updateVO.getDepartureLongitude() == null || updateVO.getDepartureLatitude() == null) && |