From 545584461e1e4e550a263665b9099d572d6a3626 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 08 五月 2024 22:21:42 +0800
Subject: [PATCH] 提交会仪统计
---
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java | 128 ++++++++++++++++++++++++++++++++++--------
zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java | 4 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java | 23 +++++++
zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java | 22 +++++++
4 files changed, 150 insertions(+), 27 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
index ec01e55..d1bbed3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
@@ -3,18 +3,38 @@
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.MeetingStatistic;
import com.ruoyi.service.MeetingStatisticService;
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;
@RestController
@RequestMapping("/zMeetingStatistic")
public class MeetingStatisticController extends BaseController {
@Autowired
private MeetingStatisticService meetingStatisticService;
-
+ /**
+ * 鍏ㄩ儴鏁版嵁
+ */
+ @GetMapping("/all")
+ public AjaxResult listAll(MeetingStatistic meetingStatistic){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return meetingStatisticService.selectDataList(meetingStatistic, pageNum, pageSize);
+ }
+ /**
+ * 鍙緭鍑哄搴彿鍜屽垱寤烘椂闂�
+ */
+ @GetMapping("/one")
+ public AjaxResult listOne(MeetingStatistic meetingStatistic){
+ return meetingStatisticService.DataList(meetingStatistic);
+ }
/**
* 淇敼浼氳缁熻
*/
@@ -24,6 +44,7 @@
return meetingStatisticService.updateData(meetingStatistic);
}
+
/**
* 鎵归噺鍒犻櫎浼氳缁熻璁板綍
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java b/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
index 5b80f37..3f3197d 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
@@ -2,7 +2,11 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.util.Date;
+
@Data
@TableName("meeting_statistic")
public class MeetingStatistic {
@@ -28,7 +32,7 @@
/**
* 鐢宠浜�
*/
- private String applyPerson;
+ private int applyPerson;
/**
* 瀹℃壒浜�
*/
@@ -37,6 +41,22 @@
* 鐘舵��
*/
private int status;
+ /**
+ * 寮�濮嬪紑浼氭椂闂�
+ */
+ @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ private Date happenStartTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ private Date happenEndTime;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
diff --git a/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java b/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
index 3f98139..4346d1e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
@@ -10,7 +10,9 @@
AjaxResult deleteData(Long[] ids);
- AjaxResult countData(Long[] familyId ,String applyPerson );
+ AjaxResult DataList(MeetingStatistic meetingStatistic);
AjaxResult addData(MeetingStatistic meetingStatistic);
+
+ AjaxResult selectDataList(MeetingStatistic meetingStatistic, Integer pageNum, Integer pageSize);
}
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..b835fdb 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
@@ -50,13 +50,72 @@
lqw.eq(!StringUtils.isEmpty(meetingStatistic.getConferenceRoom()), MeetingStatistic::getConferenceRoom, meetingStatistic.getConferenceRoom());
lqw.eq(!StringUtils.isEmpty(meetingStatistic.getTitle()), MeetingStatistic::getTitle, meetingStatistic.getTitle());
// lqw.eq(meetingStatistic.getFamilyId()!=null,MeetingStatistic::getFamilyId,meeting.getFamilyId());
- lqw.eq(!StringUtils.isEmpty(meetingStatistic.getApplyPerson()), MeetingStatistic::getApplyPerson, meetingStatistic.getApplyPerson());
+ lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getApplyPerson())), MeetingStatistic::getApplyPerson, meetingStatistic.getApplyPerson());
lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getRatifyPerson())), MeetingStatistic::getRatifyPerson, meetingStatistic.getRatifyPerson());
lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getStatus())), MeetingStatistic::getStatus, meetingStatistic.getStatus());
lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getFamilyId())), MeetingStatistic::getFamilyId, meetingStatistic.getFamilyId());
return lqw;
}
+ public static String 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 + "绉�");
+ return meetingStatistic.getUseTime();
+ }
+ 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();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+ 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,46 @@
// 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);
+ System.out.println("===============浣跨敤鏃堕棿1====================="+meetingStatistic.getUseTime());
+ 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());
+// System.out.println("===============浣跨敤鏃堕棿2====================="+dataById);
+// System.out.println("===============浣跨敤鏃堕棿2====================="+meetingStatistic);
+ newModel.setBy2(meetingStatistic.getTitle());
}else {
- newModel.setBy4(dataById.getTitle());
+// System.out.println("===============浣跨敤鏃堕棿2====================="+dataById);
+// System.out.println("===============浣跨敤鏃堕棿2====================="+meetingStatistic);
+ 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 {
@@ -112,10 +191,13 @@
// }else {
// newModel.setBy11(dataById.getStatus());
// }
+ System.out.println("===============浣跨敤鏃堕棿2====================="+dataById);
+ System.out.println("===============浣跨敤鏃堕棿2====================="+meetingStatistic);
UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
updateRequest.doc(
- "by1",newModel.getBy4(),
- "by2",newModel.getBy5()
+ "by1",newModel.getBy1(),
+ "by2",newModel.getBy2()
+
);
try {
@@ -152,11 +234,6 @@
return AjaxResult.error();
}
- }
-
- @Override
- public AjaxResult countData(Long[] familyId ,String applyPerson) {
- return null;
}
@Override
@@ -198,8 +275,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