From ccd28a0c35e8fff74da6ef63042fb8a896d78f7f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 29 六月 2022 09:45:52 +0800
Subject: [PATCH] 单位服务统计
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
index 6794e09..bfb48e3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -4,16 +4,14 @@
import com.panzhihua.common.constants.NeighborCircleConstants;
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.neighbor.*;
+import io.swagger.annotations.ApiModelProperty;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
@@ -42,7 +40,7 @@
public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
- neighborCircleAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ neighborCircleAppDTO.setPhone(loginUserInfo.getPhone());
neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
}
return communityService.pageNeighborByApp(neighborCircleAppDTO);
@@ -83,8 +81,8 @@
addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
}
}else{
- communityService.addSysConfValue(key + communityId,communityId,"社区邻里圈自动审核参数","2");
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ communityService.addSysConfValue(key + communityId,communityId,"社区邻里圈自动审核参数","1");
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
}
}else{
addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
@@ -206,27 +204,9 @@
@ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
@GetMapping("topic/list")
- public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam(value = "isZero",defaultValue = "2",required = false) Integer isZero) {
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if (loginUserInfo != null) {
- communityId = loginUserInfo.getCommunityId();
- }
- if(isZero == null){
- isZero = 2;
- }
- return communityService.getNeighborTopicByApp(communityId,isZero);
- }
-
- @ApiOperation(value = "用户新增邻里圈话题")
- @PostMapping("topic/add")
- public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO) {
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo == null){
- return R.fail(401,"请先登录");
- }
- circleTopicAppDTO.setUserId(loginUserInfo.getUserId());
- circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
- return communityService.addNeighborTopicByApp(circleTopicAppDTO);
+ public R getNeighborTopicByApp(
+ @RequestParam(value = "name",defaultValue = "",required = false) String name) {
+ return communityService.getNeighborTopicByApp(name);
}
@ApiOperation(value = "用户删除邻里圈")
@@ -240,5 +220,30 @@
circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
return communityService.deleteNeighborByApp(circleTopicAppDTO);
}
+
+ /**
+ * 分页查询邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @ApiOperation(value = "新版接单问题",response =ComActNeighborCircleAppVO.class )
+ @PostMapping("selectSolve")
+ public R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ return communityService.selectSolve(neighborCircleAppDTO);
+ }
+
+
+ /**
+ * 修改数据
+ * @param editNeighborCircleAdminVO
+ * @return
+ */
+ @ApiOperation(value = "接单 反馈",response =ComActNeighborCircleAppVO.class )
+ @PostMapping("update")
+ public R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO){
+ return this.communityService.order(editNeighborCircleAdminVO);
+ }
}
--
Gitblit v1.7.1