修改项目规划完成接口

lidongdong

2023-11-12 0379a08ee853100d85d530768599e675ee01bdad

修改项目规划完成接口

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

@@ -269,6 +269,19 @@
        return newStriveForFeign.editProjectPlanData(item);
    }


    @ApiOperation(value = "项目规划确认完工")
    @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);
    }


    @ApiOperation(value = "项目规划删除")
    @DeleteMapping("/expurgateProjectPlanData")
    public R expurgateProjectPlanData(@RequestParam("id") String id)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectPlanDTO.java

@@ -36,4 +36,11 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;

    @ApiModelProperty("确认完工时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date affirmTime;

    @ApiModelProperty("是否完成 0未完成    1完成")
    private String accomplish;

}

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

@@ -88,7 +88,7 @@
    @DeleteMapping("/expurgateProjectPlanData")
    public R expurgateProjectPlanData(@RequestParam("id") String id)
    {
        return projectPlanService.expurgateData(id);
        return projectPlanService.expurgateData(id,null);
    }



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

@@ -25,6 +25,6 @@

    int editData(@Param("item") NewFightProjectPlanDTO userId);

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

}

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

@@ -22,6 +22,6 @@

    R editData(NewFightProjectPlanDTO item);

    R expurgateData(String id);
    R expurgateData(String id,String projectId);

}

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

@@ -70,6 +70,17 @@
        int num=baseMapper.editData(item);
        if(num>0)
        {
            if(item.getList()!=null && item.getList().size()>0 )
            {
                for (NewFightProjectPlanDTO dto:item.getList())
                {
                    if(StringUtils.isEmpty(dto.getId()))
                    {
                        return R.fail("项目规划进度id不能为空");
                    }
                    projectPlanService.editData(dto);
                }
            }
            return R.ok();
        }
        return R.fail("操作失败");
@@ -81,6 +92,8 @@
        int num= baseMapper.expurgateData(id);
        if(num>0)
        {
            //删除相关项目规划进度
            projectPlanService.expurgateData(null,id);
            return R.ok();
        }
        return R.fail("操作失败");

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

@@ -60,9 +60,9 @@
    }

    @Override
    public R expurgateData(String id)
    public R expurgateData(String id,String projectId)
    {
        int num= baseMapper.expurgateData(id);
        int num= baseMapper.expurgateData(id,projectId);
        if(num>0)
        {
            return R.ok();

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

@@ -12,7 +12,8 @@
        service_time,
        unit_id,
        creation_time,
        update_time
        update_time,

    </sql>


@@ -93,6 +94,7 @@
            <if test="item.unitId !=null and item.unitId != '' ">
                unit_id,
            </if>

            creation_time
        </trim>
        values
@@ -118,6 +120,7 @@
            <if test="item.unitId !=null and item.unitId != '' ">
                #{item.unitId},
            </if>

            sysdate()
        </trim>
    </insert>
@@ -146,6 +149,7 @@
            <if test="item.unitId !=null and item.unitId != '' ">
                unit_id=#{item.unitId},
            </if>

            update_time=sysdate()
        </set>
        where id = #{item.id}

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

@@ -10,8 +10,9 @@
        completion_time,
        plan_content,
        creation_time,
        update_time

        update_time,
        affirm_time,
        accomplish
    </sql>

    <select id="getList" resultType="com.panzhihua.common.model.dtos.partybuilding.NewFightProjectPlanDTO">
@@ -54,6 +55,12 @@
            <if test="item.planContent != null and item.planContent != '' " >
                plan_content,
            </if>
            <if test="item.affirmTime !=null and item.affirmTime != '' ">
                affirm_time,
            </if>
            <if test="item.accomplish !=null and item.accomplish != '' ">
                accomplish,
            </if>
            creation_time
        </trim>
        values
@@ -72,6 +79,12 @@
            </if>
            <if test="item.planContent != null and item.planContent != '' " >
                #{item.planContent},
            </if>
            <if test="item.affirmTime !=null and item.affirmTime != '' ">
                #{item.affirmTime},
            </if>
            <if test="item.accomplish !=null and item.accomplish != '' ">
                #{item.accomplish},
            </if>
            sysdate()
        </trim>
@@ -95,13 +108,28 @@
            <if test="item.planContent != null and item.planContent != '' " >
                plan_content=#{item.planContent},
            </if>
            <if test="item.affirmTime !=null and item.affirmTime != '' ">
                affirm_time=#{item.affirmTime},
            </if>
            <if test="item.accomplish !=null and item.accomplish != '' ">
                accomplish=#{item.accomplish},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}
    </update>

    <delete id="expurgateData" parameterType="String">
        delete from new_fight_project_plan where id=#{id}
        delete from new_fight_project_plan
        <where>
            1=1
            <if test="id!=null and id !='' ">
                and id=#{id}
            </if>
            <if test="projectId!=null and projectId !='' ">
                and project_id=#{projectId}
            </if>
        </where>
    </delete>