| | |
| | |
|
| | | import javax.annotation.Resource;
|
| | | import java.io.IOException;
|
| | | import java.sql.Timestamp;
|
| | | import java.time.LocalDateTime;
|
| | | import java.util.*;
|
| | | import java.util.stream.Collectors;
|
| | |
|
| | | import static com.ruoyi.constant.MenuAuthority.*;
|
| | |
|
| | | @Slf4j
|
| | | @Service
|
| | |
| | |
|
| | | private LambdaQueryWrapper<Meeting> buildCondition(Meeting meeting) {
|
| | | LambdaQueryWrapper<Meeting> lqw = new LambdaQueryWrapper<>();
|
| | | // lqw.in(ZfDoctor::getFamilyId,familyIdList);
|
| | | lqw.orderByDesc(Meeting::getCreateTime);
|
| | | // lqw.in(ZfDoctor::getFamilyId,familyIdList);
|
| | | lqw.orderByDesc(Meeting::getId);
|
| | | lqw.like(StringUtils.isNotEmpty(meeting.getPlace()), Meeting::getPlace, meeting.getPlace())
|
| | | .like(StringUtils.isNotEmpty(meeting.getApplyApart()), Meeting::getApplyApart, meeting.getApplyApart());
|
| | | // .like(Integer.valueOf(meeting.getApplyPerson())!=null, Meeting::getApplyPerson, meeting.getApplyPerson());
|
| | |
| | | // lqw.eq(meeting.getFamilyId()!=null,Meeting::getFamilyId,meeting.getFamilyId());
|
| | | lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getApplyPerson())), Meeting::getApplyPerson, meeting.getApplyPerson());
|
| | | lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getPartPeople())), Meeting::getPartPeople, meeting.getPartPeople());
|
| | | lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getConnPerson())), Meeting::getConnPerson, meeting.getConnPerson());
|
| | | lqw.eq(!StringUtils.isEmpty(meeting.getConnPerson()), Meeting::getConnPerson, meeting.getConnPerson());
|
| | | return lqw;
|
| | | }
|
| | |
|
| | |
| | | public List<Meeting> selectByCondition(Meeting meeting) {
|
| | | //要查自己家庭的
|
| | | ZInfoUser myself = zInfoUserService.getMyself();
|
| | | System.out.println("================");
|
| | | // System.out.println("================");
|
| | |
|
| | | // Long familyId = myself.getFamilyId();
|
| | | //
|
| | |
| | | //操作后加入日志
|
| | | ZfLog zfLog = new ZfLog();
|
| | | zfLog.setUpdateTime(LocalDateTime.now());
|
| | | zfLog.setModule("会议");
|
| | | zfLog.setModule("会议申请");
|
| | | zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
|
| | | zfLogService.save(zfLog);
|
| | | System.out.println("===================================="+meeting);
|
| | | // System.out.println("===================================="+meeting);
|
| | | if(updateById(meeting)){
|
| | | //到数据库中查询对应的数据
|
| | | Meeting dataById = getById(meeting.getId());
|
| | |
|
| | | //先到es中查询到对应那条数据在es的id
|
| | | EsModel esResult = esSer.findByCtId(dataById.getId().intValue(), "会议");
|
| | | System.out.println("===================================="+meeting);
|
| | | // System.out.println("===================================="+meeting);
|
| | | if (esResult == null){
|
| | | return AjaxResult.success();
|
| | | }
|
| | |
|
| | | //操作es修改数据
|
| | | EsModel newModel = new EsModel();
|
| | | System.out.println(meeting);
|
| | | System.out.println("=============="+meeting.getConnPhone());
|
| | | // System.out.println(meeting);
|
| | | // System.out.println("=============="+meeting.getConnPhone());
|
| | | if(meeting.getTitle()!=null){
|
| | | newModel.setBy1(meeting.getTitle());
|
| | | }else {
|
| | |
| | | "by1",newModel.getBy1(),
|
| | | "by2",newModel.getBy2(),
|
| | | //"by3",newModel.getBy8(),
|
| | | // "by4",newModel.getBy9(),
|
| | | // "by4",newModel.getBy9(),
|
| | | "by5",newModel.getBy10()
|
| | | // "by6",newModel.getBy11(),
|
| | | // "by7",newModel.getBy3(),
|
| | | // "by8",newModel.getBy14(),
|
| | | // "by9",newModel.getBy15(),
|
| | | // "by10",newModel.getBy12(),
|
| | | // "by11",newModel.getBy4(),
|
| | | // "by12",newModel.getBy13(),
|
| | | // "by13",newModel.getBy15()
|
| | | // "by6",newModel.getBy11(),
|
| | | // "by7",newModel.getBy3(),
|
| | | // "by8",newModel.getBy14(),
|
| | | // "by9",newModel.getBy15(),
|
| | | // "by10",newModel.getBy12(),
|
| | | // "by11",newModel.getBy4(),
|
| | | // "by12",newModel.getBy13(),
|
| | | // "by13",newModel.getBy15()
|
| | |
|
| | | );
|
| | |
|
| | |
| | | @Override
|
| | | public AjaxResult addData(Meeting meeting) {
|
| | |
|
| | | System.out.println("-----------------000000000000");
|
| | |
|
| | | System.out.println(meeting.getStartTime());
|
| | | // System.out.println("-----------------000000000000");
|
| | | //
|
| | | // System.out.println(meeting.getStartTime());
|
| | | // ZInfoUser myself = zInfoUserService.getMyself();
|
| | | // Long familyId = myself.getFamilyId();
|
| | | //
|
| | |
| | | esModel.setCtTableName("会议记录");
|
| | | esModel.setBy1(meeting.getTitle());
|
| | | esModel.setBy2(meeting.getPlace());
|
| | | // esModel.setBy8(meeting.getConPeople());
|
| | | // esModel.setBy9(meeting.getPartPeople());
|
| | | // esModel.setBy10(meeting.getApplyPerson());
|
| | | // esModel.setBy3(meeting.getApplyApart());
|
| | | // esModel.setBy14(meeting.getStartTime());
|
| | | // esModel.setBy15(meeting.getEndTime());
|
| | | // esModel.setBy11(meeting.getIsPlacebrand());
|
| | | // esModel.setBy12(meeting.getConnPerson());
|
| | | // esModel.setBy4(meeting.getConnPhone());
|
| | | // esModel.setBy13(meeting.getStatu());
|
| | | // esModel.setBy16( meeting.getCreateTime());
|
| | | // esModel.setBy8(meeting.getConPeople());
|
| | | // esModel.setBy9(meeting.getPartPeople());
|
| | | // esModel.setBy10(meeting.getApplyPerson());
|
| | | // esModel.setBy3(meeting.getApplyApart());
|
| | | // esModel.setBy14(meeting.getStartTime());
|
| | | // esModel.setBy15(meeting.getEndTime());
|
| | | // esModel.setBy11(meeting.getIsPlacebrand());
|
| | | // esModel.setBy12(meeting.getConnPerson());
|
| | | // esModel.setBy4(meeting.getConnPhone());
|
| | | // esModel.setBy13(meeting.getStatu());
|
| | | // esModel.setBy16( meeting.getCreateTime());
|
| | | //这里存储查询详情的路径
|
| | | esModel.setBy5("/zMeeting");
|
| | | // esModel.setFid(familyId);
|
| | | esSer.insertTable(esModel);
|
| | | System.out.println(esModel);
|
| | | // System.out.println(esModel);
|
| | |
|
| | | return AjaxResult.success();
|
| | | } else {
|
| | |
| | |
|
| | | }
|
| | | }
|
| | | }
|
| | | } |