From 50f8c2d9841ee74006ac25cc5e022eae69c55d2c Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 四月 2024 20:24:33 +0800
Subject: [PATCH] 提交会议会议审批
---
/dev/null | 4 -
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingRatifyServiceImpl.java | 130 ++++++++++++++++++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingRatifyController.java | 37 +++++++++
zhang-content/src/main/java/com/ruoyi/service/MeetingRatifyService.java | 11 ++
zhang-content/src/main/java/com/ruoyi/mapper/MeetingRatifyMapper.java | 9 ++
5 files changed, 184 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingRatifyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingRatifyController.java
new file mode 100644
index 0000000..c69c303
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingRatifyController.java
@@ -0,0 +1,37 @@
+package com.ruoyi.web.controller.zhang;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.domain.Meeting;
+import com.ruoyi.service.MeetingRatifyService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
+
+@Slf4j
+@RestController
+@RequestMapping("/zMeetingRatify")
+public class MeetingRatifyController extends BaseController {
+ @Autowired
+ private MeetingRatifyService meetingRatifyService;
+
+ @Log(title = "浼氳瀹℃壒", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody Meeting meeting) {
+ return meetingRatifyService.updateData(meeting);
+ }
+
+ @GetMapping("/all")
+ public AjaxResult listAll(Meeting meeting){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return meetingRatifyService.selectDataList(meeting, pageNum, pageSize);
+ }
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/MeetingRatifyMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/MeetingRatifyMapper.java
new file mode 100644
index 0000000..e0ee573
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/MeetingRatifyMapper.java
@@ -0,0 +1,9 @@
+package com.ruoyi.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.Meeting;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeetingRatifyMapper extends BaseMapper<Meeting> {
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/MeetingRatifyService.java b/zhang-content/src/main/java/com/ruoyi/service/MeetingRatifyService.java
index 3daf4e4..494cf06 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/MeetingRatifyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/MeetingRatifyService.java
@@ -1,4 +1,13 @@
package com.ruoyi.service;
-public interface MeetingRatifyService {
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.Meeting;
+
+public interface MeetingRatifyService extends IService<Meeting> {
+
+ AjaxResult selectDataList(Meeting meeting, Integer pageNum, Integer pageSize);
+
+ AjaxResult updateData(Meeting meeting);
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java b/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
deleted file mode 100644
index 47beb24..0000000
--- a/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.ruoyi.service;
-
-public class MeetingStatisticService {
-}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingRatifyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingRatifyServiceImpl.java
index 4489abe..c66e998 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingRatifyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingRatifyServiceImpl.java
@@ -1,4 +1,130 @@
package com.ruoyi.service.impl;
-public class MeetingRatifyServiceImpl {
-}
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.EsModel;
+import com.ruoyi.common.utils.MapUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.Meeting;
+import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfLog;
+import com.ruoyi.mapper.MeetingRatifyMapper;
+import com.ruoyi.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.elasticsearch.action.update.UpdateRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+
+@Slf4j
+@Service
+public class MeetingRatifyServiceImpl extends ServiceImpl<MeetingRatifyMapper, Meeting> implements MeetingRatifyService {
+
+ @Resource
+ ZInfoUserService zInfoUserService;
+
+ @Resource
+ ZfLogService zfLogService;
+
+ @Resource
+ private EsService esSer;
+
+ @Resource
+ private RestHighLevelClient restHighLevelClient;
+
+ private LambdaQueryWrapper<Meeting> buildCondition(Meeting meeting) {
+ LambdaQueryWrapper<Meeting> lqw = new LambdaQueryWrapper<>();
+ // lqw.in(ZfDoctor::getFamilyId,familyIdList);
+ lqw.orderByDesc(Meeting::getCreateTime);
+ 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.between(meeting.getHappenStartTime() != null && meeting.getHappenEndTime() != null, Meeting::getStartTime, meeting.getHappenStartTime(), meeting.getHappenEndTime());
+
+ return lqw;
+ }
+
+
+ @Override
+ public AjaxResult selectDataList(Meeting meeting, Integer pageNum, Integer pageSize) {
+ //瑕佹煡鑷繁瀹跺涵鐨�
+ ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
+ Long familyId = myself.getFamilyId();
+// //涔熻鏌ュ埆浜烘巿鏉冪殑
+// List<ZAuthority> authority = zAuthorityService.getAuthority();
+// List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(DOCTOR_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
+// //鍔犱笂鑷繁瀹跺涵鐨刬d
+// idList.add(familyId);
+// String familyIds = listFamilyIds();
+// String secondFamilyAuthority = listSecondFamilyIds();
+ LambdaQueryWrapper<Meeting> lqw = buildCondition(meeting);
+
+
+ Page<Meeting> meetingPage = new Page<>(pageNum, pageSize);
+ Page<Meeting> pageResult = page(meetingPage, lqw);
+
+ List<Meeting> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+// System.out.println(beanRecords);
+
+
+
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+ return AjaxResult.success(data); }
+
+
+ @Override
+ public AjaxResult updateData(Meeting meeting) {
+
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("浼氳瀹℃壒");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
+
+ if (updateById(meeting)) {
+ //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+ Meeting dataById = getById(meeting.getId());
+
+ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+ EsModel esResult = esSer.findByCtId(dataById.getId().intValue(), "浼氳");
+ System.out.println("====================================" + meeting);
+ if (esResult == null) {
+ return AjaxResult.success();
+ }
+
+ //鎿嶄綔es淇敼鏁版嵁
+ EsModel newModel = new EsModel();
+ if (meeting.getStatu() != 0) {
+ newModel.setBy13(meeting.getStatu());
+ } else {
+ newModel.setBy13(dataById.getStatu());
+ }
+
+ UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+ updateRequest.doc(
+ "by12", newModel.getBy13()
+ );
+ try {
+ restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ return AjaxResult.success();
+ } else {
+ return AjaxResult.error();
+ }
+ }}
--
Gitblit v1.9.1