| | |
| | | public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize) |
| | | { |
| | | return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize); |
| | | return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize, |
| | | getCommunityId()+"",getUserId()+""); |
| | | } |
| | | |
| | | @ApiOperation(value = "社区共建项目删除", response = NewFightCommunityConstructionDTO.class) |
| | |
| | | } |
| | | |
| | | |
| | | /******************************************************************************************************** |
| | | * |
| | | * 项目评论 |
| | | * |
| | | ******************************************************************************************************/ |
| | | |
| | | @ApiOperation(value = "项目评论列表", response = NewFightProjectEvaluateDTO.class) |
| | | @GetMapping("/getEvaluateList") |
| | | public R getEvaluateList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam("projectId") String projectId) |
| | | { |
| | | return newStriveForFeign.getEvaluateList(pageNum,pageSize,projectId); |
| | | } |
| | | |
| | | @ApiOperation(value = "项目评论详情", response = NewFightProjectEvaluateDTO.class) |
| | | @GetMapping("/getEvaluateDetails") |
| | | public R getEvaluateDetails(@RequestParam("id") String id) |
| | | { |
| | | return newStriveForFeign.getEvaluateDetails(id); |
| | | } |
| | | |
| | | @ApiOperation(value = "项目评论新增") |
| | | @PostMapping("/addEvaluateData") |
| | | public R addEvaluateData(@RequestBody NewFightProjectEvaluateDTO item) |
| | | { |
| | | return newStriveForFeign.addEvaluateData(item); |
| | | } |
| | | |
| | | @ApiOperation(value = "项目评论编辑") |
| | | @PostMapping("/editEvaluateData") |
| | | public R editEvaluateData(@RequestBody NewFightProjectEvaluateDTO item) |
| | | { |
| | | return newStriveForFeign.editEvaluateData(item); |
| | | } |
| | | |
| | | @ApiOperation(value = "项目评论删除") |
| | | @DeleteMapping("/expurgateEvaluateData") |
| | | public R expurgateEvaluateData(@RequestParam("id") String id) |
| | | { |
| | | return newStriveForFeign.expurgateEvaluateData(id); |
| | | } |
| | | |
| | | |
| | | } |
| | |
| | | @ApiModelProperty("社区id") |
| | | private String communityId; |
| | | |
| | | @ApiModelProperty("是否参与0 未参与 1已参与") |
| | | private String isJoin="0"; |
| | | |
| | | @ApiModelProperty("预计完工时间") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
| | | private Date estimatedTime; |
New file |
| | |
| | | package com.panzhihua.common.model.dtos.partybuilding; |
| | | |
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
| | | import io.swagger.annotations.ApiModel; |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | |
| | | import java.util.Date; |
| | | |
| | | @Data |
| | | @ApiModel("新双争双评项目评论") |
| | | public class NewFightProjectEvaluateDTO |
| | | { |
| | | @ApiModelProperty("主键") |
| | | private String id; |
| | | |
| | | |
| | | @ApiModelProperty("项目id") |
| | | private String projectId; |
| | | |
| | | |
| | | @ApiModelProperty("评价内容") |
| | | private String content; |
| | | |
| | | @ApiModelProperty("评分") |
| | | private String score; |
| | | |
| | | @ApiModelProperty("参与用户id") |
| | | private String userId; |
| | | |
| | | @ApiModelProperty("参与用户姓名") |
| | | private String userName; |
| | | |
| | | @ApiModelProperty("参与用户头像") |
| | | private String userImg; |
| | | |
| | | @ApiModelProperty("创建时间") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
| | | private Date creationTime; |
| | | |
| | | @ApiModelProperty("更新时间") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
| | | private Date updateTime; |
| | | |
| | | } |
| | |
| | | ****************************************************************************************************************/ |
| | | @GetMapping("/NewFightCommunity/getNeedClaimList") |
| | | public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize); |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam(value = "communityId", required = false) String communityId, |
| | | @RequestParam(value = "userId", required = false) String userId); |
| | | |
| | | @GetMapping("/NewFightCommunity/getNeedClaimDetails") |
| | | public R getNewFightCommunityDetails(@RequestParam("id") String id); |
| | |
| | | @DeleteMapping("/NewFightCommunity/expurgateJoinData") |
| | | public R expurgateJoinData(@RequestParam("id") String id); |
| | | |
| | | |
| | | |
| | | /******************************************************************************************************** |
| | | * |
| | | * 项目评论 |
| | | * |
| | | ******************************************************************************************************/ |
| | | |
| | | @GetMapping("/NewFightCommunity/getEvaluateList") |
| | | public R getEvaluateList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam("projectId") String projectId); |
| | | |
| | | @GetMapping("/NewFightCommunity/getEvaluateDetails") |
| | | public R getEvaluateDetails(@RequestParam("id") String id); |
| | | |
| | | |
| | | @PostMapping("/NewFightCommunity/addEvaluateData") |
| | | public R addEvaluateData(@RequestBody NewFightProjectEvaluateDTO item); |
| | | |
| | | @PostMapping("/NewFightCommunity/editEvaluateData") |
| | | public R editEvaluateData(@RequestBody NewFightProjectEvaluateDTO item); |
| | | |
| | | @DeleteMapping("/NewFightCommunity/expurgateEvaluateData") |
| | | public R expurgateEvaluateData(@RequestParam("id") String id); |
| | | |
| | | |
| | | |
| | | } |
| | |
| | | package com.panzhihua.service_dangjian.api; |
| | | |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.panzhihua.common.model.dtos.partybuilding.NewFightCommunityConstructionDTO; |
| | | import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectEvaluateDTO; |
| | | import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectJoinDTO; |
| | | import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectPlanDTO; |
| | | import com.panzhihua.common.model.vos.R; |
| | | import com.panzhihua.service_dangjian.service.NewFightCommunityConstructionService; |
| | | import com.panzhihua.service_dangjian.service.NewFightProjectEvaluateService; |
| | | import com.panzhihua.service_dangjian.service.NewFightProjectJoinService; |
| | | import com.panzhihua.service_dangjian.service.NewFightProjectPlanService; |
| | | import lombok.extern.slf4j.Slf4j; |
| | |
| | | |
| | | @GetMapping("/getNeedClaimList") |
| | | public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize) |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam(value = "communityId", required = false) String communityId, |
| | | @RequestParam(value = "userId", required = false) String userId) |
| | | { |
| | | return R.ok(claimService.getList(pageNum,pageSize)); |
| | | return R.ok(claimService.getList(pageNum,pageSize,communityId,userId)); |
| | | } |
| | | |
| | | @GetMapping("/getNeedClaimDetails") |
| | |
| | | return joinService.expurgateData(id,null); |
| | | } |
| | | |
| | | /******************************************************************************************************** |
| | | * |
| | | * 项目评论 |
| | | * |
| | | ******************************************************************************************************/ |
| | | |
| | | |
| | | @Resource |
| | | private NewFightProjectEvaluateService evaluateService; |
| | | |
| | | |
| | | @GetMapping("/NewFightCommunity/getEvaluateList") |
| | | public R getEvaluateList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam("projectId") String projectId) |
| | | { |
| | | return R.ok(evaluateService.getList(pageNum,pageSize,projectId)); |
| | | } |
| | | |
| | | @GetMapping("/getEvaluateDetails") |
| | | public R getEvaluateDetails(@RequestParam("id") String id) |
| | | { |
| | | return R.ok(evaluateService.getDetails(id)); |
| | | } |
| | | |
| | | |
| | | @PostMapping("/addEvaluateData") |
| | | public R addEvaluateData(@RequestBody NewFightProjectEvaluateDTO item) |
| | | { |
| | | return evaluateService.addData(item); |
| | | } |
| | | |
| | | @PostMapping("/editEvaluateData") |
| | | public R editEvaluateData(@RequestBody NewFightProjectEvaluateDTO item) |
| | | { |
| | | return evaluateService.editData(item); |
| | | } |
| | | |
| | | @DeleteMapping("/expurgateEvaluateData") |
| | | public R expurgateEvaluateData(@RequestParam("id") String id) |
| | | { |
| | | return evaluateService.expurgateData(id,null); |
| | | } |
| | | |
| | | |
| | | |
| | | |
| | | |
| | |
| | | public interface NewFightCommunityConstructionDAO extends BaseMapper<NewFightCommunityConstructionDTO> |
| | | { |
| | | |
| | | IPage<NewFightCommunityConstructionDTO> getList(Page page); |
| | | IPage<NewFightCommunityConstructionDTO> getList(Page page, |
| | | @Param("communityId") String communityId, |
| | | @Param("userId") String userId); |
| | | |
| | | NewFightCommunityConstructionDTO getDetails(@Param("id")String id); |
| | | |
New file |
| | |
| | | package com.panzhihua.service_dangjian.dao; |
| | | |
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectEvaluateDTO; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.apache.ibatis.annotations.Param; |
| | | |
| | | /** |
| | | * @program: springcloud_k8s_panzhihuazhihuishequ |
| | | * @description: 党员双争双评排序 |
| | | * @author: huang.hongfa weixin hhf9596 qq 959656820 |
| | | * @create: 2021-01-21 17:37 |
| | | **/ |
| | | @Mapper |
| | | public interface NewFightProjectEvaluateDAO extends BaseMapper<NewFightProjectEvaluateDTO> |
| | | { |
| | | |
| | | IPage<NewFightProjectEvaluateDTO> getList(Page page, @Param("projectId") String projectId); |
| | | |
| | | NewFightProjectEvaluateDTO getDetails(@Param("id")String id); |
| | | |
| | | int addData(@Param("item") NewFightProjectEvaluateDTO item); |
| | | |
| | | int editData(@Param("item") NewFightProjectEvaluateDTO item); |
| | | |
| | | int expurgateData(@Param("id") String id,@Param("projectId") String projectId); |
| | | |
| | | } |
| | |
| | | public interface NewFightCommunityConstructionService |
| | | { |
| | | |
| | | IPage<NewFightCommunityConstructionDTO> getList(int pageNum, int pageSize); |
| | | IPage<NewFightCommunityConstructionDTO> getList(int pageNum, int pageSize, |
| | | String communityId,String userId); |
| | | |
| | | NewFightCommunityConstructionDTO getDetails(String id); |
| | | |
New file |
| | |
| | | package com.panzhihua.service_dangjian.service; |
| | | |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectEvaluateDTO; |
| | | import com.panzhihua.common.model.vos.R; |
| | | |
| | | /** |
| | | * @program: springcloud_k8s_panzhihuazhihuishequ |
| | | * @description: 党组织 |
| | | * @author: huang.hongfa weixin hhf9596 qq 959656820 |
| | | * @create: 2020-11-30 11:39 |
| | | **/ |
| | | public interface NewFightProjectEvaluateService |
| | | { |
| | | |
| | | IPage<NewFightProjectEvaluateDTO> getList(int pageNum, int pageSize, String projectId); |
| | | |
| | | NewFightProjectEvaluateDTO getDetails(String id); |
| | | |
| | | R addData(NewFightProjectEvaluateDTO item); |
| | | |
| | | R editData(NewFightProjectEvaluateDTO item); |
| | | |
| | | R expurgateData(String id,String projectId); |
| | | |
| | | } |
| | |
| | | |
| | | |
| | | @Override |
| | | public IPage<NewFightCommunityConstructionDTO> getList(int pageNum, int pageSize) |
| | | public IPage<NewFightCommunityConstructionDTO> getList(int pageNum, int pageSize, |
| | | String communityId,String userId) |
| | | { |
| | | Page page = new Page<>(pageNum,pageSize); |
| | | return baseMapper.getList(page); |
| | | return baseMapper.getList(page,communityId,userId); |
| | | } |
| | | |
| | | @Override |
New file |
| | |
| | | package com.panzhihua.service_dangjian.service.impl; |
| | | |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectEvaluateDTO; |
| | | import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectJoinDTO; |
| | | import com.panzhihua.common.model.vos.R; |
| | | import com.panzhihua.service_dangjian.dao.NewFightProjectEvaluateDAO; |
| | | import com.panzhihua.service_dangjian.dao.NewFightProjectJoinDAO; |
| | | import com.panzhihua.service_dangjian.service.NewFightProjectEvaluateService; |
| | | import com.panzhihua.service_dangjian.service.NewFightProjectJoinService; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | /** |
| | | * @program: springcloud_k8s_panzhihuazhihuishequ |
| | | * @description: 党组织 |
| | | * @author: huang.hongfa weixin hhf9596 qq 959656820 |
| | | * @create: 2020-11-30 11:40 |
| | | **/ |
| | | @Service |
| | | public class NewFightProjectEvaluateServiceImpl extends ServiceImpl<NewFightProjectEvaluateDAO, |
| | | NewFightProjectEvaluateDTO> implements NewFightProjectEvaluateService |
| | | { |
| | | |
| | | |
| | | @Override |
| | | public IPage<NewFightProjectEvaluateDTO> getList(int pageNum, int pageSize,String projectId) |
| | | { |
| | | Page page = new Page<>(pageNum,pageSize); |
| | | return baseMapper.getList(page,projectId); |
| | | } |
| | | |
| | | @Override |
| | | public NewFightProjectEvaluateDTO getDetails(String id) |
| | | { |
| | | return baseMapper.getDetails(id); |
| | | } |
| | | |
| | | @Override |
| | | public R addData(NewFightProjectEvaluateDTO item) |
| | | { |
| | | int num=baseMapper.addData(item); |
| | | if(num>0) |
| | | { |
| | | return R.ok(); |
| | | } |
| | | return R.fail("操作失败"); |
| | | } |
| | | |
| | | @Override |
| | | public R editData(NewFightProjectEvaluateDTO item) |
| | | { |
| | | int num=baseMapper.editData(item); |
| | | if(num>0) |
| | | { |
| | | return R.ok(); |
| | | } |
| | | return R.fail("操作失败"); |
| | | } |
| | | |
| | | @Override |
| | | public R expurgateData(String id,String projectId) |
| | | { |
| | | int num= baseMapper.expurgateData(id,projectId); |
| | | if(num>0) |
| | | { |
| | | return R.ok(); |
| | | } |
| | | return R.fail("操作失败"); |
| | | } |
| | | |
| | | |
| | | } |
| | |
| | | </sql> |
| | | |
| | | <select id="getList" resultType="com.panzhihua.common.model.dtos.partybuilding.NewFightCommunityConstructionDTO"> |
| | | SELECT <include refid="Base_Column_List"></include> |
| | | FROM new_fight_community_construction |
| | | SELECT |
| | | nfcc.id, |
| | | nfcc.item_cover, |
| | | nfcc.item_title, |
| | | nfcc.agreement_title, |
| | | nfcc.agreement_customization_time, |
| | | nfcc.agreement_content, |
| | | nfcc.construction_community_id, |
| | | nfcc.estimated_time, |
| | | nfcc.creation_time, |
| | | nfcc.update_time, |
| | | nfcc.user_id, |
| | | ifnull(count(nfpj.id),0) as isJoin, |
| | | nfcc.community_id |
| | | FROM new_fight_community_construction as nfcc |
| | | LEFT JOIN new_fight_project_join as nfpj ON nfpj.user_id=#{userId} |
| | | <where> |
| | | 1=1 |
| | | <if test="communityId !=null and communityId != '' "> |
| | | and construction_community_id =#{communityId} |
| | | </if> |
| | | </where> |
| | | </select> |
| | | |
| | | <select id="getDetails" resultType="com.panzhihua.common.model.dtos.partybuilding.NewFightCommunityConstructionDTO"> |
New file |
| | |
| | | <?xml version="1.0" encoding="UTF-8"?> |
| | | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
| | | <mapper namespace="com.panzhihua.service_dangjian.dao.NewFightProjectEvaluateDAO"> |
| | | |
| | | <!-- 通用查询结果列 --> |
| | | <sql id="Base_Column_List"> |
| | | id, |
| | | content, |
| | | score, |
| | | project_id, |
| | | user_id, |
| | | creation_time, |
| | | update_time |
| | | </sql> |
| | | |
| | | <select id="getList" resultType="com.panzhihua.common.model.dtos.partybuilding.NewFightProjectEvaluateDTO"> |
| | | SELECT |
| | | nfpj.id, |
| | | nfpj.project_id, |
| | | nfpj.user_id, |
| | | nfpj.content, |
| | | nfpj.score, |
| | | su.name as userName, |
| | | su.image_url as userImg, |
| | | nfpj.creation_time, |
| | | nfpj.update_time |
| | | FROM new_fight_project_evaluate as nfpj |
| | | LEFT JOIN sys_user as su ON su.user_id=nfpj.user_id |
| | | <where> |
| | | 1=1 |
| | | <if test="projectId !=null and projectId != '' "> |
| | | and nfpj.project_id=#{projectId} |
| | | </if> |
| | | </where> |
| | | </select> |
| | | |
| | | <select id="getDetails" resultType="com.panzhihua.common.model.dtos.partybuilding.NewFightProjectEvaluateDTO"> |
| | | SELECT |
| | | nfpj.id, |
| | | nfpj.project_id, |
| | | nfpj.user_id, |
| | | nfpj.content, |
| | | nfpj.score, |
| | | su.name as userName, |
| | | su.image_url as userImg, |
| | | nfpj.creation_time, |
| | | nfpj.update_time |
| | | FROM new_fight_project_evaluate as nfpj |
| | | LEFT JOIN sys_user as su ON su.user_id=nfpj.user_id |
| | | <where> |
| | | 1=1 |
| | | <if test="id !=null and id != '' "> |
| | | and nfpj.id =#{id} |
| | | </if> |
| | | </where> |
| | | </select> |
| | | |
| | | <insert id="addData"> |
| | | insert into new_fight_project_evaluate |
| | | <trim prefix="(" suffix=")" suffixOverrides=","> |
| | | <if test="item.id != null and item.id != '' " > |
| | | id, |
| | | </if> |
| | | <if test="item.projectId != null and item.projectId != '' " > |
| | | project_id, |
| | | </if> |
| | | <if test="item.userId != null and item.userId != '' " > |
| | | user_id, |
| | | </if> |
| | | creation_time |
| | | </trim> |
| | | values |
| | | <trim prefix="(" suffix=")" suffixOverrides=","> |
| | | <if test="item.id != null" > |
| | | #{item.id}, |
| | | </if> |
| | | <if test="item.projectId != null and item.projectId != '' " > |
| | | #{item.projectId}, |
| | | </if> |
| | | <if test="item.userId != null and item.userId != '' " > |
| | | #{item.userId}, |
| | | </if> |
| | | sysdate() |
| | | </trim> |
| | | </insert> |
| | | |
| | | <update id="editData"> |
| | | update new_fight_project_evaluate |
| | | <set> |
| | | <if test="item.id != null" > |
| | | id=#{item.id}, |
| | | </if> |
| | | <if test="item.projectId != null and item.projectId != '' " > |
| | | project_id=#{item.projectId}, |
| | | </if> |
| | | <if test="item.userId != null and item.userId != '' " > |
| | | user_id=#{item.userId}, |
| | | </if> |
| | | update_time=sysdate() |
| | | </set> |
| | | where id = #{item.id} |
| | | </update> |
| | | |
| | | <delete id="expurgateData" parameterType="String"> |
| | | delete from new_fight_project_evaluate |
| | | <where> |
| | | 1=1 |
| | | <if test="id!=null and id !='' "> |
| | | and id=#{id} |
| | | </if> |
| | | <if test="projectId!=null and projectId !='' "> |
| | | and project_id=#{projectId} |
| | | </if> |
| | | </where> |
| | | </delete> |
| | | |
| | | |
| | | </mapper> |
| | | |