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

@@ -47,7 +47,7 @@
    {

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

        NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
        item.setId(id);
@@ -58,7 +58,7 @@

        if(num>0)
        {
            int accomplishNum=baseMapper.getNum(id,"1");
            int accomplishNum=baseMapper.getNum(planDTO.getProjectId(),"1");
            NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
            dto.setId(planDTO.getProjectId());
            if(pNum==accomplishNum)