lidongdong
2023-11-13 95a2379f12592e560cc5858ef6aea8877dae7198
新增党员参加项目模块
5个文件已添加
4个文件已修改
377 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectJoinDTO.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightProjectJoinDAO.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightProjectJoinService.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectJoinServiceImpl.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightProjectJoinMapper.xml 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -290,5 +290,51 @@
    }
    /********************************************************************************************************
     *
     *                           项目参与
     *
     ******************************************************************************************************/
    @ApiOperation(value = "项目参与人员列表", response = NewFightProjectJoinDTO.class)
    @GetMapping("/getJoinList")
    public R  getJoinList(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam("projectId") String projectId)
    {
        return newStriveForFeign.getJoinList(pageNum,pageSize,projectId);
    }
    @ApiOperation(value = "项目参与人员详情", response = NewFightProjectJoinDTO.class)
    @GetMapping("/getJoinDetails")
    public R  getJoinDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getJoinDetails(id);
    }
    @ApiOperation(value = "项目参与人员报名")
    @PostMapping("/addJoinData")
    public R addJoinData(@RequestBody NewFightProjectJoinDTO item)
    {
        return newStriveForFeign.addJoinData(item);
    }
    @ApiOperation(value = "项目参与人员修改")
    @PostMapping("/editJoinData")
    public R editJoinData(@RequestBody NewFightProjectJoinDTO item)
    {
        return newStriveForFeign.editJoinData(item);
    }
    @ApiOperation(value = "项目参与人员取消报名")
    @DeleteMapping("/expurgateJoinData")
    public R expurgateJoinData(@RequestParam("id") String id)
    {
        return newStriveForFeign.expurgateJoinData(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java
@@ -57,16 +57,16 @@
    @ApiModelProperty("电话")
    private String phone;
    @ApiModelProperty("联系电话")
    @ApiModelProperty("签到范围")
    private String signInScope;
    @ApiModelProperty("签到范围")
    @ApiModelProperty("签退范围")
    private String signOutScope;
    @ApiModelProperty("签退范围")
    @ApiModelProperty("奖励")
    private String award;
    @ApiModelProperty("奖励")
    @ApiModelProperty("内容")
    private String content;
    @ApiModelProperty("图片")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectJoinDTO.java
New file
@@ -0,0 +1,32 @@
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 NewFightProjectJoinDTO
{
    @ApiModelProperty("主键")
    private String id;
    @ApiModelProperty("项目id")
    private String projectId;
    @ApiModelProperty("参与用户id")
    private String userId;
    @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;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -164,6 +164,28 @@
    public R expurgateProjectPlanData(@RequestParam("id") String id);
    /********************************************************************************************************
     *
     *                           项目参与
     *
     ******************************************************************************************************/
    @GetMapping("/NewFightCommunity/getJoinList")
    public R  getJoinList(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam("projectId") String projectId);
    @GetMapping("/NewFightCommunity/getJoinDetails")
    public R  getJoinDetails(@RequestParam("id") String id);
    @PostMapping("/NewFightCommunity/addJoinData")
    public R addJoinData(@RequestBody NewFightProjectJoinDTO item);
    @PostMapping("/NewFightCommunity/editJoinData")
    public R editJoinData(@RequestBody NewFightProjectJoinDTO item);
    @DeleteMapping("/NewFightCommunity/expurgateJoinData")
    public R expurgateJoinData(@RequestParam("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java
@@ -1,9 +1,11 @@
package com.panzhihua.service_dangjian.api;
import com.panzhihua.common.model.dtos.partybuilding.NewFightCommunityConstructionDTO;
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.NewFightProjectJoinService;
import com.panzhihua.service_dangjian.service.NewFightProjectPlanService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -92,5 +94,48 @@
    }
    /********************************************************************************************************
     *
     *                           项目参与
     *
     ******************************************************************************************************/
    @Resource
    private NewFightProjectJoinService joinService;
    @GetMapping("/getJoinList")
    public R  getJoinList(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam("projectId") String projectId)
    {
        return R.ok(joinService.getList(pageNum,pageSize,projectId));
    }
    @GetMapping("/getJoinDetails")
    public R  getJoinDetails(@RequestParam("id") String id)
    {
        return R.ok(joinService.getDetails(id));
    }
    @PostMapping("/addJoinData")
    public R addJoinData(@RequestBody NewFightProjectJoinDTO item)
    {
        return joinService.addData(item);
    }
    @PostMapping("/editJoinData")
    public R editJoinData(@RequestBody NewFightProjectJoinDTO item)
    {
        return joinService.editData(item);
    }
    @DeleteMapping("/expurgateJoinData")
    public R expurgateJoinData(@RequestParam("id") String id)
    {
        return joinService.expurgateData(id,null);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightProjectJoinDAO.java
New file
@@ -0,0 +1,30 @@
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.NewFightProjectJoinDTO;
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 NewFightProjectJoinDAO extends BaseMapper<NewFightProjectJoinDTO>
{
    IPage<NewFightProjectJoinDTO> getList(Page page,@Param("projectId") String projectId);
    NewFightProjectJoinDTO getDetails(@Param("id")String id);
    int addData(@Param("item") NewFightProjectJoinDTO item);
    int editData(@Param("item") NewFightProjectJoinDTO item);
    int expurgateData(@Param("id") String id,@Param("projectId") String projectId);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightProjectJoinService.java
New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_dangjian.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectJoinDTO;
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 NewFightProjectJoinService
{
    IPage<NewFightProjectJoinDTO> getList(int pageNum, int pageSize, String projectId);
    NewFightProjectJoinDTO getDetails(String id);
    R addData(NewFightProjectJoinDTO item);
    R editData(NewFightProjectJoinDTO item);
    R expurgateData(String id,String projectId);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectJoinServiceImpl.java
New file
@@ -0,0 +1,71 @@
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.NewFightProjectJoinDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_dangjian.dao.NewFightProjectJoinDAO;
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 NewFightProjectJoinServiceImpl extends ServiceImpl<NewFightProjectJoinDAO,
        NewFightProjectJoinDTO> implements NewFightProjectJoinService
{
    @Override
    public IPage<NewFightProjectJoinDTO> getList(int pageNum, int pageSize,String projectId)
    {
        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getList(page,projectId);
    }
    @Override
    public NewFightProjectJoinDTO getDetails(String id)
    {
        return baseMapper.getDetails(id);
    }
    @Override
    public R addData(NewFightProjectJoinDTO item)
    {
        int num=baseMapper.addData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
    @Override
    public R editData(NewFightProjectJoinDTO 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("操作失败");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightProjectJoinMapper.xml
New file
@@ -0,0 +1,97 @@
<?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.NewFightProjectJoinDAO">
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id,
        project_id,
        user_id,
        creation_time,
        update_time
    </sql>
    <select id="getList" resultType="com.panzhihua.common.model.dtos.partybuilding.NewFightProjectJoinDTO">
        SELECT <include refid="Base_Column_List"></include>
        FROM new_fight_project_join
        <where>
            1=1
            <if test="projectId !=null and projectId != '' ">
                and project_id=#{projectId}
            </if>
        </where>
    </select>
    <select id="getDetails" resultType="com.panzhihua.common.model.dtos.partybuilding.NewFightProjectJoinDTO">
        SELECT <include refid="Base_Column_List"></include>
        FROM new_fight_project_join
        <where>
            1=1
            <if test="id !=null and id != '' ">
                and id =#{id}
            </if>
        </where>
    </select>
    <insert id="addData">
        insert into new_fight_project_join
        <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_join
        <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_join
        <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>