From 0379a08ee853100d85d530768599e675ee01bdad Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 12 十一月 2023 17:04:46 +0800
Subject: [PATCH] 修改项目规划完成接口
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 260 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
index f285770..bd19df0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -1,18 +1,17 @@
package com.panzhihua.applets.api;
-
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.service.community.CommunityWestService;
import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
+import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
@Slf4j
@Api(tags = {"双挣双评新模块-小程序"})
@@ -24,12 +23,15 @@
@Resource
private NewStriveForFeign newStriveForFeign;
+ @ApiOperation(value = "获取党员个人排名", response = UserRankDTO.class)
@GetMapping("/NewStriveFor/getUserRank")
public R getUserRank()
{
return newStriveForFeign.getUserRank(getUserId()+"");
}
+
+ @ApiOperation(value = "获取党员排名列表", response = UserRankDTO.class)
@GetMapping("/NewStriveFor/getUserRankList")
public R getUserRankList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize)
@@ -37,4 +39,256 @@
return newStriveForFeign.getUserRankList(pageNum,pageSize,getUserId()+"");
}
+
+ @ApiOperation(value = "获取累计积分")
+ @GetMapping("/getAllintegral")
+ public R getAllintegral(@RequestParam("type") String type,
+ @RequestParam("userId") String userId)
+ {
+ return newStriveForFeign.getAllintegral(type,userId);
+ }
+
+
+ /*****************************************************************************************************************
+ *
+ * 任务需求清单
+ *
+ ******************************************************************************************************************/
+ @ApiOperation(value = "任务需求清单列表", response = NeedProblemInventoryDTO.class)
+ @GetMapping("/NeedProblem/getList")
+ public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "kind", required = false)String kind,
+ @RequestParam(value = "userId", required = false)String userId)
+ {
+ return newStriveForFeign.getNeedProblemList(pageNum,pageSize,kind,userId,getCommunityId()+"");
+ }
+
+ @ApiOperation(value = "任务需求清单详情", response = NeedProblemInventoryDTO.class)
+ @GetMapping("/NeedProblem/getDetails")
+ public R getNeedProblemDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getNeedProblemDetails(id);
+ }
+
+ @ApiOperation(value = "新增任务需求")
+ @PostMapping("/NeedProblem/addData")
+ public R addNeedProblemData(@RequestBody NeedProblemInventoryDTO item)
+ {
+ return newStriveForFeign.addNeedProblemData(item);
+ }
+
+ @ApiOperation(value = "编辑任务需求")
+ @PostMapping("/NeedProblem/editData")
+ public R editNeedProblemData(@RequestBody NeedProblemInventoryDTO item)
+ {
+ return newStriveForFeign.editNeedProblemData(item);
+ }
+
+ @ApiOperation(value = "删除任务需求")
+ @DeleteMapping("/NeedProblem/expurgateData")
+ public R expurgateNeedProblemData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateNeedProblemData(id);
+ }
+
+
+ /*******************************************************************************************************
+ *
+ * 任务需求报名
+ *
+ *******************************************************************************************************/
+ @ApiOperation(value = "任务报名列表", response = NeedProblemClaimDTO.class)
+ @GetMapping("/getNeedClaimList")
+ public R getNeedClaimList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "kind", required = false) String kind,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "unitId", required = false) String unitId)
+ {
+ return newStriveForFeign.getNeedClaimList(pageNum,pageSize,kind,userId,unitId);
+ }
+
+ @ApiOperation(value = "任务报名详情", response = NeedProblemClaimDTO.class)
+ @GetMapping("/getNeedClaimDetails")
+ public R getNeedClaimDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getNeedClaimDetails(id);
+ }
+
+ @ApiOperation(value = "任务报名")
+ @PostMapping("/addNeedClaimData")
+ public R addNeedClaimData(@RequestBody NeedProblemClaimDTO item)
+ {
+ return newStriveForFeign.addNeedClaimData(item);
+ }
+
+ @ApiOperation(value = "修改任务报名")
+ @PostMapping("/editNeedClaimData")
+ public R editNeedClaimData(@RequestBody NeedProblemClaimDTO item)
+ {
+ return newStriveForFeign.editNeedClaimData(item);
+ }
+
+ @ApiOperation(value = "取消报名")
+ @DeleteMapping("/expurgateNeedClaimData")
+ public R expurgateNeedClaimData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateNeedClaimData(id);
+ }
+
+
+ @ApiOperation(value = "打卡")
+ @GetMapping("/needClaimSignIn")
+ public R needClaimSignIn(@RequestParam("taskId") String taskId,
+ @RequestParam("userId") String userId,
+ @RequestParam("type") String type)
+ {
+
+ return newStriveForFeign.needClaimSignIn(taskId,userId,type);
+ }
+
+ /***************************************************************************************************************
+ *
+ * 代单位接受
+ *
+ *************************************************************************************************************/
+ @ApiOperation(value = "代单位任务报名列表", response = NeedProblemUnitTaskDTO.class)
+ @GetMapping("/getNeedTaskList")
+ public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageNum") int pageSize,
+ @RequestParam(value = "unitId", required = false) String unitId)
+ {
+ return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId);
+ }
+
+ @ApiOperation(value = "代单位任务报名详情", response = NeedProblemUnitTaskDTO.class)
+ @GetMapping("/getNeedTaskDetails")
+ public R getNeedTaskDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getNeedTaskDetails(id);
+ }
+
+ @ApiOperation(value = "代单位任务添加")
+ @PostMapping("/addNeedTaskData")
+ public R addNeedTaskData(@RequestBody NeedProblemUnitTaskDTO item)
+ {
+ return newStriveForFeign.addNeedTaskData(item);
+ }
+
+ @ApiOperation(value = "代单位任务修改")
+ @PostMapping("/editNeedTaskData")
+ public R editNeedTaskData(@RequestBody NeedProblemUnitTaskDTO item)
+ {
+ return newStriveForFeign.editNeedTaskData(item);
+ }
+
+ @ApiOperation(value = "代单位任务删除")
+ @DeleteMapping("/expurgateNeedTaskData")
+ public R expurgateNeedTaskData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateNeedTaskData(id);
+ }
+
+
+ /*******************************************************************************************************************
+ *
+ * 新双争双评社区共建
+ *
+ ****************************************************************************************************************/
+
+ @ApiOperation(value = "社区共建项目列表", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getNewFightCommunityList")
+ public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize);
+ }
+
+ @ApiOperation(value = "社区共建项目删除", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getNewFightCommunityDetails")
+ public R getNewFightCommunityDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getNewFightCommunityDetails(id);
+ }
+
+ @ApiOperation(value = "社区共建项目添加")
+ @PostMapping("/addNewFightCommunityData")
+ public R addNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item)
+ {
+ return newStriveForFeign.addNewFightCommunityData(item);
+ }
+
+ @ApiOperation(value = "社区共建项目编辑")
+ @PostMapping("/editNewFightCommunityData")
+ public R editNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item)
+ {
+ return newStriveForFeign.editNewFightCommunityData(item);
+ }
+
+ @ApiOperation(value = "社区共建项目删除")
+ @DeleteMapping("/expurgateNewFightCommunityData")
+ public R expurgateNewFightCommunityData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateNewFightCommunityData(id);
+ }
+
+
+ /**************************************************************************************************************
+ *
+ * 项目规划
+ *
+ ****************************************************************************************************************/
+ @ApiOperation(value = "项目规划列表", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getProjectPlanList")
+ public R getProjectPlanList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId)
+ {
+ return newStriveForFeign.getProjectPlanList(pageNum,pageSize,projectId);
+ }
+
+ @ApiOperation(value = "项目规划详情", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getProjectPlanDetails")
+ public R getProjectPlanDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getProjectPlanDetails(id);
+ }
+
+ @ApiOperation(value = "项目规划添加")
+ @PostMapping("/addProjectPlanData")
+ public R addProjectPlanData(@RequestBody NewFightProjectPlanDTO item)
+ {
+ return newStriveForFeign.addProjectPlanData(item);
+ }
+
+ @ApiOperation(value = "项目规划编辑")
+ @PostMapping("/editProjectPlanData")
+ public R editProjectPlanData(@RequestBody NewFightProjectPlanDTO item)
+ {
+ return newStriveForFeign.editProjectPlanData(item);
+ }
+
+
+ @ApiOperation(value = "项目规划确认完工")
+ @PostMapping("/editProjectPlanAccomplish")
+ public R editProjectPlanAccomplish(@RequestParam("id") String id)
+ {
+ NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
+ item.setId(id);
+ item.setAffirmTime(new Date());
+ item.setAccomplish("1");
+ return newStriveForFeign.editProjectPlanData(item);
+ }
+
+
+ @ApiOperation(value = "项目规划删除")
+ @DeleteMapping("/expurgateProjectPlanData")
+ public R expurgateProjectPlanData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateProjectPlanData(id);
+ }
+
+
+
}
--
Gitblit v1.7.1