社区组织共建状态

lidongdong

2023-11-15 5cd81c86fc3c0d96e28c0bbe5f97126b15a567d8

社区组织共建状态

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java

@@ -304,11 +304,7 @@
    @PostMapping("/editProjectPlanAccomplish")
    public R editProjectPlanAccomplish(@RequestParam("id") String id)
    {
        NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
        item.setId(id);
        item.setAffirmTime(new Date());
        item.setAccomplish("1");
        return newStriveForFeign.editProjectPlanData(item);
        return newStriveForFeign.editProjectPlanAccomplish(id);
    }



 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java

@@ -181,6 +181,10 @@
    public R expurgateProjectPlanData(@RequestParam("id") String id);


    @GetMapping("/NewFightCommunity/editProjectPlanAccomplish")
    public R  editProjectPlanAccomplish(@RequestParam("id") String id);


    /********************************************************************************************************
     *
     *                           项目参与

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java

@@ -99,6 +99,13 @@
    }


    @GetMapping("/editProjectPlanAccomplish")
    public R  editProjectPlanAccomplish(@RequestParam("id") String id)
    {
        return projectPlanService.editProjectPlanAccomplish(id);
    }


    /********************************************************************************************************
     *
     *                           项目参与

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightProjectPlanDAO.java

@@ -27,4 +27,5 @@

    int expurgateData(@Param("id") String id,@Param("projectId") String projectId);

    int getNum(@Param("projectId") String projectId,@Param("accomplish") String accomplish);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightProjectPlanService.java

@@ -18,6 +18,8 @@

    NewFightProjectPlanDTO getDetails(String id);

    R editProjectPlanAccomplish(String id);

    R addData(NewFightProjectPlanDTO item);

    R editData(NewFightProjectPlanDTO item);

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

@@ -12,6 +12,9 @@
import com.panzhihua.service_dangjian.service.NewFightProjectPlanService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党组织
@@ -22,6 +25,10 @@
public class NewFightProjectPlanServiceImpl extends ServiceImpl<NewFightProjectPlanDAO,
        NewFightProjectPlanDTO> implements NewFightProjectPlanService
{


    @Resource
    private NewFightCommunityConstructionService constructionService;


    @Override
@@ -38,6 +45,38 @@
    }

    @Override
    public R editProjectPlanAccomplish(String id)
    {
        NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
        item.setId(id);
        item.setAffirmTime(new Date());
        item.setAccomplish("1");
        int num=baseMapper.editData(item);

        if(num>0)
        {
            NewFightProjectPlanDTO planDTO=baseMapper.getDetails(id);
            int pNum=baseMapper.getNum(id,null);
            int accomplishNum=baseMapper.getNum(id,"1");
            NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
            dto.setId(planDTO.getProjectId());
            if(pNum==accomplishNum)
            {
                //已完成
                dto.setStatus("3");
            }
            else
            {
                //进行中
                dto.setStatus("2");
            }
            constructionService.editData(dto);
            return R.ok();
        }
        return R.fail("操作失败");
    }

    @Override
    public R addData(NewFightProjectPlanDTO item)
    {
        int num=baseMapper.addData(item);

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightProjectPlanMapper.xml

@@ -132,6 +132,21 @@
        </where>
    </delete>

    <select id="getNum" parameterType="String">
        select count(id) from new_fight_project_plan
        <where>
            1=1
            <if test=" projectId!=null and projectId!=''  ">
                and project_id=#{projectId}
            </if>
            <if test=" accomplish!=null and accomplish!=''  ">
                and accomplish=#{accomplish}
            </if>
        </where>
    </select>




</mapper>