Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java

@@ -10,10 +10,12 @@
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;
import java.util.Date;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -30,23 +32,22 @@
    private NeedProblemInventoryService inventoryService;

    @Override
    public IPage<NeedProblemClaimDTO> getList(int pageNum, int pageSize,
                                              String taskId, String userId,String unitId)
    public List<NeedProblemClaimDTO> getList(String taskId, String userId, String unitId)
    {
        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getList(page,taskId,userId,unitId);
//        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getList(taskId,userId,unitId);
    }

    @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
    public R addData(NeedProblemClaimDTO item)
    {
        //任务问题详情
        NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(item.getTaskId());
        NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(item.getTaskId(),item.getUserId());
        long times=System.currentTimeMillis();
        if(times<inventoryDTO.getClaimStartTime().getTime())
        {
@@ -93,11 +94,11 @@
    }

    @Override
    public R expurgateData(String id)
    public R expurgateData(String id,String taskId,String userId)
    {
        //报名信息
        NeedProblemClaimDTO claimDTO=baseMapper.getDetails(id);
        NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(claimDTO.getTaskId());
        NeedProblemClaimDTO claimDTO=baseMapper.getDetails(id,taskId,userId);
        NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(claimDTO.getTaskId(),claimDTO.getUserId());
        long times=System.currentTimeMillis();

        if(times>inventoryDTO.getNeedStartTime().getTime())
@@ -105,7 +106,7 @@
            return R.fail("任务已开始！不能取消");
        }

        int num=baseMapper.expurgateData(id);
        int num=baseMapper.expurgateData(id, taskId, userId);
        if(num>0)
        {
            return R.ok();