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 | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 112 insertions(+), 4 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 4e0e8cb..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.NeedProblemClaimDTO; -import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO; -import com.panzhihua.common.model.dtos.partybuilding.NeedProblemUnitTaskDTO; -import com.panzhihua.common.model.dtos.partybuilding.UserRankDTO; +import com.panzhihua.common.model.dtos.partybuilding.*; import com.panzhihua.common.model.vos.R; 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.*; import javax.annotation.Resource; +import java.util.Date; @Slf4j @Api(tags = {"双挣双评新模块-小程序"}) @@ -138,6 +137,17 @@ 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); + } + /*************************************************************************************************************** * * 代单位接受 @@ -181,6 +191,104 @@ } + /******************************************************************************************************************* + * + * 新双争双评社区共建 + * + ****************************************************************************************************************/ + + @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