lidongdong
2023-11-14 d5e21a2737d62e7e0c74f94f1330dec56ae748eb
修改任务社区id4
7个文件已修改
35 ■■■■ 已修改文件
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 4 ●●● 补丁 | 查看 | 原始文档 | 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 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -136,9 +136,11 @@
    @ApiOperation(value = "任务报名详情", response = NeedProblemClaimDTO.class)
    @GetMapping("/getNeedClaimDetails")
    public R getNeedClaimDetails(@RequestParam("id") String id)
    public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
                                 @RequestParam(value = "taskId", required = false) String taskId,
                                 @RequestParam(value = "userId", required = false) String userId)
    {
        return newStriveForFeign.getNeedClaimDetails(id);
        return newStriveForFeign.getNeedClaimDetails(id,taskId,userId);
    }
    @ApiOperation(value = "任务报名")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -87,7 +87,9 @@
                              @RequestParam(value = "unitId", required = false) String unitId);
    @GetMapping("/NeedClaim/getNeedClaimDetails")
    public R getNeedClaimDetails(@RequestParam("id") String id);
    public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
                                 @RequestParam(value = "taskId", required = false) String taskId,
                                 @RequestParam(value = "userId", required = false) String userId);
    @PostMapping("/NeedClaim/addNeedClaimData")
    public R addNeedClaimData(@RequestBody NeedProblemClaimDTO item);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java
@@ -26,9 +26,11 @@
    }
    @GetMapping("/getNeedClaimDetails")
    public R getNeedClaimDetails(@RequestParam("id") String id)
    public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
                                 @RequestParam(value = "taskId", required = false) String taskId,
                                 @RequestParam(value = "userId", required = false) String userId)
    {
        return R.ok(claimService.getDetails(id));
        return R.ok(claimService.getDetails(id, taskId, userId));
    }
    @PostMapping("/addNeedClaimData")
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java
@@ -24,7 +24,9 @@
                                      @Param("userId") String userId,
                                      @Param("unitId") String unitId);
    NeedProblemClaimDTO getDetails(@Param("id")String id);
    NeedProblemClaimDTO getDetails(@Param("id")String id,
                                   @Param("taskId") String taskId,
                                   @Param("userId") String userId);
    NeedProblemClaimDTO getUserIdDetails(@Param("taskId") String taskId,
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java
@@ -20,7 +20,7 @@
    List<NeedProblemClaimDTO> getList(String taskId, String userId, String unitId);
    NeedProblemClaimDTO getDetails(String id);
    NeedProblemClaimDTO getDetails(String id,String taskId,String userId);
    R addData(NeedProblemClaimDTO item);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java
@@ -10,6 +10,7 @@
import com.panzhihua.service_dangjian.dao.NeedProblemClaimDAO;
import com.panzhihua.service_dangjian.service.NeedProblemClaimService;
import com.panzhihua.service_dangjian.service.NeedProblemInventoryService;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -38,8 +39,8 @@
    }
    @Override
    public NeedProblemClaimDTO getDetails(String id) {
        return baseMapper.getDetails(id);
    public NeedProblemClaimDTO getDetails(String id,String taskId, String userId) {
        return baseMapper.getDetails(id,taskId,userId);
    }
    @Override
@@ -96,7 +97,7 @@
    public R expurgateData(String id,String taskId,String userId)
    {
        //报名信息
        NeedProblemClaimDTO claimDTO=baseMapper.getDetails(id);
        NeedProblemClaimDTO claimDTO=baseMapper.getDetails(id,taskId,userId);
        NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(claimDTO.getTaskId(),claimDTO.getUserId());
        long times=System.currentTimeMillis();
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml
@@ -68,6 +68,12 @@
            <if test="id !=null and id != '' ">
                and nfnpc.id =#{id}
            </if>
            <if test="taskId !=null and taskId != '' ">
                and nfnpc.task_id =#{taskId}
            </if>
            <if test="userId !=null and userId != '' ">
                and nfnpc.user_id =#{userId}
            </if>
        </where>
    </select>