| | |
| | | }else{ |
| | | memberTask.setTaskStatus(3); |
| | | } |
| | | memberTask.setEmergencyState(merCreateMemberTaskDto.getEmergencyState()); |
| | | memberTask.setShopId(merCreateMemberTaskDto.getShopId()); |
| | | memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId()); |
| | | memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate()); |
| | |
| | | memberTask.setUserId(oldMemberTask.getUserId()); |
| | | memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate()); |
| | | memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent()); |
| | | memberTask.setEmergencyState(merFollowMemberTaskDto.getEmergencyState()); |
| | | int i = merFollowMemberTaskDto.getNextTaskDate().compareTo(nowTimeStr); |
| | | if(i>0){ |
| | | memberTask.setTaskStatus(0); |