花城 修改代单位接单人数满了不能接单  报名时间未开始不能代单位接单  组织共建状态逻辑修改
3个文件已修改
38 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemUnitTaskServiceImpl.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java
@@ -58,6 +58,12 @@
        {
            return R.fail("报名已结束");
        }
        if(StringUtils.equals(inventoryDTO.getJoinNum(),inventoryDTO.getClaimNum()))
        {
            return R.fail("认领人数已满");
        }
        int isJion= baseMapper.getJionNum(item.getTaskId(),item.getUserId());
        if(isJion>0)
        {
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemUnitTaskServiceImpl.java
@@ -3,14 +3,16 @@
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.NeedProblemInventoryDTO;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemUnitTaskDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiExperienceActivityVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.NeedProblemUnitTaskDAO;
import com.panzhihua.service_dangjian.service.NeedProblemInventoryService;
import com.panzhihua.service_dangjian.service.NeedProblemUnitTaskService;
import org.springframework.stereotype.Service;
import java.util.List;
import javax.annotation.Resource;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -22,7 +24,9 @@
public class NeedProblemUnitTaskServiceImpl extends ServiceImpl<NeedProblemUnitTaskDAO, NeedProblemUnitTaskDTO>
    implements NeedProblemUnitTaskService
{
    //任务 问题接口
    @Resource
    private NeedProblemInventoryService inventoryService;
    @Override
    public IPage<NeedProblemUnitTaskDTO> getList(int pageNum, int pageSize, String unitId,String kind,String status)
@@ -40,6 +44,23 @@
    @Override
    public R addData(NeedProblemUnitTaskDTO item)
    {
        //任务问题详情
        NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(item.getTaskId(),item.getUserId());
        long times=System.currentTimeMillis();
        if(times<inventoryDTO.getClaimStartTime().getTime())
        {
            return R.fail("报名未开始");
        }
        if(StringUtils.equals(inventoryDTO.getJoinNum(),inventoryDTO.getClaimNum()))
        {
            return R.fail("认领人数已满");
        }
        if(times>inventoryDTO.getClaimEndTime().getTime())
        {
            return R.fail("报名已结束");
        }
        int num=baseMapper.isGet(item.getTaskId(),item.getUnitId());
        if(num>0)
        {
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java
@@ -133,11 +133,10 @@
            {
                if(new Date().getTime()>estimatedTime.getTime())
                {
                    int pNum=projectPlanService.getNum(item.getId(),null);
                    int accomplishNum=projectPlanService.getNum(item.getId(),"1");
                    int accomplishNum=projectPlanService.getNum(item.getId(),"0");
                    NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
                    dto.setId(item.getId());
                    if(pNum==accomplishNum)
                    if(accomplishNum==0)
                    {
                        //已完成
                        dto.setStatus("3");