java/zhihuishenqu.git

			@@ -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,15 +32,15 @@
			private NeedProblemInventoryService inventoryService;

			@Override
			public IPage<NeedProblemClaimDTO> getList(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(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
			@@ -92,10 +94,10 @@
			}

			@Override
			public R expurgateData(String id)
			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();

			@@ -104,7 +106,7 @@
			return R.fail("任务已开始！不能取消");
			}

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