社区组织共建修改

lidongdong

2023-11-15 4ad2b7bbd4b11e0c8eabf3d8c33ee4ca5f122d60

社区组织共建修改

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

@@ -38,9 +38,15 @@
    @ApiModelProperty("社区id")
    private String communityId;

    @ApiModelProperty("社区名字")
    private String communityName;

    @ApiModelProperty("是否参与0 未参与  1已参与")
    private String isJoin="0";

    @ApiModelProperty("状态（1已发布  2进行中 3已完成）")
    private String status="1";

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

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java

@@ -107,7 +107,7 @@


    @ApiOperation(value = "项目规划确认完工")
    @PostMapping("/editProjectPlanAccomplish")
    @GetMapping("/editProjectPlanAccomplish")
    public R editProjectPlanAccomplish(@RequestParam("id") String id)
    {
        NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();

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

@@ -49,6 +49,7 @@
    @Override
    public R addData(NewFightCommunityConstructionDTO item)
    {
        item.setStatus("1");
        int num=baseMapper.addData(item);
        if(num>0)
        {

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

@@ -15,6 +15,7 @@
        creation_time,
        update_time,
        user_id,
        status,
        community_id
    </sql>

@@ -31,10 +32,13 @@
            nfcc.creation_time,
            nfcc.update_time,
            nfcc.user_id,
            nfcc.status,
            ca.name as communityName,
            ifnull(count(nfpj.id),0) as isJoin,
            nfcc.community_id
        FROM new_fight_community_construction as nfcc
        LEFT JOIN new_fight_project_join as nfpj ON nfpj.user_id=#{userId}
        LEFT JOIN com_act as ca ON ca.community_id=nfcc.community_id
        <where>
            1=1
            <if test="communityId !=null and communityId != '' ">
@@ -44,12 +48,29 @@
    </select>

    <select id="getDetails" resultType="com.panzhihua.common.model.dtos.partybuilding.NewFightCommunityConstructionDTO">
        SELECT <include refid="Base_Column_List"></include>
        FROM new_fight_community_construction
        SELECT
            nfcc.id,
            nfcc.item_cover,
            nfcc.item_title,
            nfcc.agreement_title,
            nfcc.agreement_customization_time,
            nfcc.agreement_content,
            nfcc.construction_community_id,
            nfcc.estimated_time,
            nfcc.creation_time,
            nfcc.update_time,
            nfcc.user_id,
            nfcc.status,
            ca.name as communityName,
            ifnull(count(nfpj.id),0) as isJoin,
            nfcc.community_id
        FROM new_fight_community_construction as nfcc
        LEFT JOIN new_fight_project_join as nfpj ON nfpj.user_id=#{userId}
        LEFT JOIN com_act as ca ON ca.community_id=nfcc.community_id
        <where>
            1=1
            <if test="id !=null and id != '' ">
                and id =#{id}
                and nfcc.id =#{id}
            </if>
        </where>
    </select>
@@ -88,6 +109,9 @@
            <if test="item.communityId != null and item.communityId != '' " >
                community_id,
            </if>
            <if test="item.status != null and item.status != '' " >
                status,
            </if>
            creation_time
        </trim>
        values
@@ -121,6 +145,9 @@
            </if>
            <if test="item.communityId != null and item.communityId != '' " >
                #{item.communityId},
            </if>
            <if test="item.status != null and item.status != '' " >
                #{item.status},
            </if>
            sysdate()
        </trim>
@@ -159,6 +186,9 @@
            <if test="item.communityId != null and item.communityId != '' " >
                community_id=#{item.communityId},
            </if>
            <if test="item.status != null and item.status != '' " >
                status=#{item.status},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}