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/NewFightProjectPlanServiceImpl.java

@@ -45,11 +45,9 @@
    @Override
    public R editProjectPlanAccomplish(String id)
    {
        int accomplishNum=baseMapper.getNum(id,"1");
        NewFightProjectPlanDTO planDTO=baseMapper.getDetails(id);
        int pNum=baseMapper.getNum(id,null);
        accomplishNum++;

        NewFightProjectPlanDTO planDTO=baseMapper.getDetails(id);
        int pNum=baseMapper.getNum(planDTO.getProjectId(),null);

        NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
        item.setId(id);
@@ -57,8 +55,10 @@
        item.setAccomplish("1");
        int num=baseMapper.editData(item);


        if(num>0)
        {
            int accomplishNum=baseMapper.getNum(planDTO.getProjectId(),"1");
            NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
            dto.setId(planDTO.getProjectId());
            if(pNum==accomplishNum)
@@ -71,7 +71,8 @@
                //进行中
                dto.setStatus("2");
            }
            return R.ok(constructionService.editData(dto));
            constructionService.editData(dto);
            return R.ok();
        }
        return R.fail("操作失败");
    }