From 72204a91cd4e734adfcc5e5a5aace9f6fbb30223 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 06 九月 2024 18:10:34 +0800
Subject: [PATCH] 花城 修改双报道个人服务统计时常次数不正确3
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
index 2b74587..9995455 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -10,15 +10,18 @@
import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanRequestVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComEvent;
+import com.panzhihua.service_community.service.ComSanShuoExpertService;
import com.panzhihua.service_community.service.IComEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -27,6 +30,9 @@
import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
/**
* ClassName ComEventController
@@ -43,6 +49,10 @@
@Resource
private IComEventService comEventService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private ComSanShuoExpertService comSanShuoExpertService;
/**
@@ -64,6 +74,9 @@
comEvent.setRequestUserId(loginUser.getUserId());
comEvent.setRequestUserName(loginUser.getName());
comEvent.setRequestUserTel(loginUser.getPhone());
+ if (isNull(comEventVO.getAppId())){
+ comEvent.setAppId(loginUser.getAppId());
+ }
return comEventService.insertComEvent(comEvent);
}
@@ -153,8 +166,19 @@
@PostMapping("/page")
public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) {
Page pagination = new Page(pageNo, pageSize);
- ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
- return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
+ ComEvent comEvent=new ComEvent();
+ BeanUtils.copyProperties(comEventVO, comEvent);
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ if (isNull(comEventVO.getAppId())){
+// String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
+ String appId = getAppId();
+ comEvent.setAppId(appId);
+ }
+ comEvent.setCommunityId(loginUserInfo.getCommunityId());
+ LoginUserInfoVO loginUserInfo1 = this.getLoginUserInfo();
+ loginUserInfo1.setType(userService.detailUser(this.getUserId()).getData().getType());
+// loginUserInfo1.setType(loginUserInfo.getType());
+ return comEventService.pageByComEvent(comEvent, pagination,loginUserInfo1);
}
@@ -248,8 +272,9 @@
public R rejectRequest(@RequestParam("id") Long id) {
ComEvent comEvent = comEventService.getById(id);
comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
- comEvent.setSpecialistName(null);
+ comEvent.setSpecialistName("待分配");
comEvent.setSpecialistId(null);
+ comEventService.updateEventStransferRecord(id);
return R.ok(comEventService.updateById(comEvent));
}
@@ -312,8 +337,10 @@
*/
@ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
@GetMapping("/status/calculate")
- public R calculate() {
- return comEventService.calculate();
+ public R calculate(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ loginUserInfo.setType(userService.detailUser(loginUserInfo.getUserId()).getData().getType());
+ return comEventService.calculate(loginUserInfo,level,id);
}
/**
@@ -333,4 +360,30 @@
public R eventIndexData(@RequestParam Integer type) {
return comEventService.eventIndexData(type);
}
+
+
+ /**
+ *可选街道列表
+ * */
+ @GetMapping("/streetList")
+ public R getStreetId(){
+ return comEventService.listStreetScreen();
+ }
+
+ /**
+ *可选社区列表
+ * */
+ @GetMapping("/communityList")
+ public R getCommunityList(){
+ return comEventService.listCommunityScreen();
+ }
+
+ /**
+ * 获取事件范围筛选列表
+ * */
+ @GetMapping("/rangeList")
+ public R rangeList(){
+ return comSanShuoExpertService.rangeList();
+ }
+
}
--
Gitblit v1.7.1