From 2f432628a460a73f830c278a7d69e8328767a7b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java |  130 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 109 insertions(+), 21 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
index b099b67..fc33ed5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
@@ -1,9 +1,11 @@
 package com.ruoyi.service.impl;
 
 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.*;
 import com.ruoyi.mapper.MeetingStatisticMapper;
@@ -17,9 +19,7 @@
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 
 @Slf4j
@@ -56,7 +56,66 @@
         lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getFamilyId())), MeetingStatistic::getFamilyId, meetingStatistic.getFamilyId());
         return lqw;
     }
+    public static void getDatePoor(Date endDate, Date nowDate, MeetingStatistic meetingStatistic) {
 
+        long nd = 1000 * 24 * 60 * 60;
+        long nh = 1000 * 60 * 60;
+        long nm = 1000 * 60;
+         long ns = 1000;
+        // 鑾峰緱涓や釜鏃堕棿鐨勬绉掓椂闂村樊寮�
+        long diff = endDate.getTime() - nowDate.getTime();
+        // 璁$畻宸灏戝ぉ
+//        long day = diff / nd;
+        // 璁$畻宸灏戝皬鏃�
+        long hour = diff % nd / nh;
+        // 璁$畻宸灏戝垎閽�
+        long min = diff % nd % nh / nm;
+        // 璁$畻宸灏戠//杈撳嚭缁撴灉
+         long sec = diff % nd % nh % nm / ns;
+        System.out.println(hour + "灏忔椂" + min + "鍒嗛挓"+ sec + "绉�");
+        meetingStatistic.setUseTime(hour + "灏忔椂" + min + "鍒嗛挓" + sec + "绉�");
+    }
+    private LambdaQueryWrapper<MeetingStatistic> buildCondition(MeetingStatistic meetingStatistic) {
+        LambdaQueryWrapper<MeetingStatistic> lqw = new LambdaQueryWrapper<>();
+        lqw.select(MeetingStatistic::getFamilyId,MeetingStatistic::getCreateTime);
+        return lqw;
+    }
+    @Override
+    public AjaxResult selectDataList(MeetingStatistic meetingStatistic, 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<MeetingStatistic> lqw = new LambdaQueryWrapper<>();
+//        LambdaQueryWrapper<MeetingStatistic> lqw = buildCondition(meetingStatistic);
+
+
+        Page<MeetingStatistic> meetingStatisticPage = new Page<>(pageNum, pageSize);
+        Page<MeetingStatistic> pageResult = page(meetingStatisticPage, lqw);
+
+        List<MeetingStatistic> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+        System.out.println("-----------鏁版嵁搴�-----------"+beanRecords);
+        HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+        return AjaxResult.success(data);
+    }
+    @Override
+    public AjaxResult DataList(MeetingStatistic meetingStatistic) {
+        LambdaQueryWrapper<MeetingStatistic> lambdaQueryWrapper = buildCondition(meetingStatistic);
+        List<MeetingStatistic> beanRecords = list(lambdaQueryWrapper);
+        log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
+        return  AjaxResult.success(beanRecords);
+    }
 
     @Override
     public AjaxResult updateData(MeetingStatistic meetingStatistic) {
@@ -82,26 +141,41 @@
 //            System.out.println(meeting);
 //            System.out.println("=============="+meetingStatistic.getConnPhone());
 
-//            if(meetingStatistic.getUseTime()!=null){
-//                newModel.setBy2(meetingStatistic.getUseTime());
-//            }else {
-//                newModel.setBy2(dataById.getUseTime());
+//           if (meetingStatistic.getUseTime()==null){
+//                if(meetingStatistic.getHappenEndTime()!=null && meetingStatistic.getHappenStartTime() !=null){
+//                  getDatePoor(meetingStatistic.getHappenEndTime(),meetingStatistic.getHappenStartTime(),meetingStatistic);
+//                    System.out.println("===============浣跨敤鏃堕棿====================="+meetingStatistic.getUseTime());
+//                    newModel.setBy2(meetingStatistic.getUseTime());
+//                }else {
+//                    newModel.setBy2(dataById.getUseTime());
+//                }
 //            }
+            if (meetingStatistic.getUseTime()==null){
+                if(meetingStatistic.getHappenEndTime()!=null && meetingStatistic.getHappenStartTime() !=null){
+                    getDatePoor(meetingStatistic.getHappenEndTime(),meetingStatistic.getHappenStartTime(),meetingStatistic);
+                    newModel.setBy1(meetingStatistic.getUseTime());
+                }
+                else {
+                    newModel.setBy1(dataById.getUseTime());
+                }
+            }else {
+                newModel.setBy1(dataById.getUseTime());
+            }
 //            if(meetingStatistic.getConferenceRoom()!=null){
 //                newModel.setBy3(meetingStatistic.getConferenceRoom());
 //            }else {
 //                newModel.setBy3(dataById.getConferenceRoom());
 //            }
             if(meetingStatistic.getTitle()!=null){
-                newModel.setBy4(meetingStatistic.getTitle());
+                newModel.setBy2(meetingStatistic.getTitle());
             }else {
-                newModel.setBy4(dataById.getTitle());
+                newModel.setBy2(dataById.getTitle());
             }
-            if(meetingStatistic.getApplyPerson()!=null){
-                newModel.setBy5(meetingStatistic.getApplyPerson());
-            }else {
-                newModel.setBy5(dataById.getApplyPerson());
-            }
+//            if(meetingStatistic.getApplyPerson()!=null){
+//                newModel.setBy5(meetingStatistic.getApplyPerson());
+//            }else {
+//                newModel.setBy5(dataById.getApplyPerson());
+//            }
 //            if(meetingStatistic.getRatifyPerson() == 0){
 //                newModel.setBy10(meetingStatistic.getRatifyPerson());
 //            }else {
@@ -114,15 +188,21 @@
 //            }
             UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
             updateRequest.doc(
-                    "by1",newModel.getBy4(),
-                    "by2",newModel.getBy5()
+                    "by1",newModel.getBy1(),
+                    "by2",newModel.getBy2()
+
             );
+
+            LambdaQueryWrapper<MeetingStatistic> lqw = new LambdaQueryWrapper<>();
+            List<MeetingStatistic> beanRecords = list(lqw);
+            log.info("sss浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
 
             try {
                 restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
+
 
             return AjaxResult.success();
         }else {
@@ -155,10 +235,15 @@
     }
 
     @Override
-    public AjaxResult countData(Long[] familyId ,String applyPerson) {
-        return null;
-    }
+    public List<MeetingStatistic> selectByIds(Long[] ids) {
+        List<MeetingStatistic> list = new ArrayList<>();
+        if (ids.length != 0)
+            list = listByIds(Arrays.asList(ids));
+        else
+            list = list();
+        return list;
 
+    }
     @Override
     public AjaxResult addData(MeetingStatistic meetingStatistic) {
 
@@ -198,8 +283,11 @@
             esModel.setId(uuid);
             esModel.setCtId(inte);
             esModel.setCtTableName("浼氳缁熻");
-            esModel.setBy1(meetingStatistic.getTitle());
-            esModel.setBy5(meetingStatistic.getApplyPerson());
+            getDatePoor(meetingStatistic.getHappenEndTime(),meetingStatistic.getHappenStartTime(),meetingStatistic);
+            System.out.println("===============浣跨敤鏃堕棿2====================="+meetingStatistic.getUseTime());
+            esModel.setBy1(meetingStatistic.getUseTime());
+            esModel.setBy2(meetingStatistic.getTitle());
+//            esModel.setBy5(meetingStatistic.getApplyPerson());
             //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
             esModel.setBy5("/zMeetingStatistic");
             esModel.setFid(familyId);

--
Gitblit v1.9.1