lidongdong
2023-11-14 2dc3710673e83e36aafe57c1dc4d483bb0848de1
修改任务问题id
7个文件已修改
41 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -253,9 +253,11 @@
    @ApiOperation(value = "社区共建项目删除")
    @DeleteMapping("/expurgateNewFightCommunityData")
    public R expurgateNewFightCommunityData(@RequestParam("id") String id)
    public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id,
                                            @RequestParam(value = "taskId", required = false) String taskId,
                                            @RequestParam(value = "userId", required = false) String userId)
    {
        return newStriveForFeign.expurgateNewFightCommunityData(id);
        return newStriveForFeign.expurgateNewFightCommunityData(id,taskId,userId);
    }
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -150,7 +150,9 @@
    public R editNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item);
    @DeleteMapping("/NewFightCommunity/expurgateNeedClaimData")
    public R expurgateNewFightCommunityData(@RequestParam("id") String id);
    public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id,
                                            @RequestParam(value = "taskId", required = false) String taskId,
                                            @RequestParam(value = "userId", required = false) String userId);
    /**************************************************************************************************************
@@ -226,7 +228,6 @@
    @DeleteMapping("/NewFightCommunity/expurgateEvaluateData")
    public R  expurgateEvaluateData(@RequestParam("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java
@@ -44,9 +44,11 @@
    }
    @DeleteMapping("/expurgateNeedClaimData")
    public R expurgateNeedClaimData(@RequestParam("id") String id)
    public R expurgateNeedClaimData(@RequestParam(value = "id", required = false) String id,
                                    @RequestParam(value = "taskId", required = false) String taskId,
                                    @RequestParam(value = "userId", required = false) String userId)
    {
        return claimService.expurgateData(id);
        return claimService.expurgateData(id,taskId,userId);
    }
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java
@@ -34,7 +34,9 @@
    int editData(@Param("item") NeedProblemClaimDTO userId);
    int expurgateData(@Param("id") String id);
    int expurgateData(@Param("id") String id,
                      @Param("taskId") String taskId,
                      @Param("userId") String userId);
    int getJionNum(@Param("taskId") String taskId,
                   @Param("userId") String userId);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java
@@ -26,7 +26,7 @@
    R editData(NeedProblemClaimDTO item);
    R expurgateData(String id);
    R expurgateData(String id,String taskId,String userId);
    int getJionNum(String taskId,String userId);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java
@@ -93,7 +93,7 @@
    }
    @Override
    public R expurgateData(String id)
    public R expurgateData(String id,String taskId,String userId)
    {
        //报名信息
        NeedProblemClaimDTO claimDTO=baseMapper.getDetails(id);
@@ -105,7 +105,7 @@
            return R.fail("任务已开始!不能取消");
        }
        int num=baseMapper.expurgateData(id);
        int num=baseMapper.expurgateData(id, taskId, userId);
        if(num>0)
        {
            return R.ok();
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml
@@ -188,7 +188,19 @@
    </update>
    <delete id="expurgateData" parameterType="String">
        delete from new_fight_need_problem_claim where id=#{id}
        delete from new_fight_need_problem_claim
        <where>
            1=1
            <if test="id!=null and id != '' ">
                and id=#{id}
            </if>
            <if test="userId !=null and userId != '' ">
                and user_id=#{userId}
            </if>
            <if test="taskId !=null and taskId != '' ">
                and task_id=#{taskId}
            </if>
        </where>
    </delete>
    <select id="getJionNum" resultType="int">