花城 修改社区组织共建逻辑

lidongdong

2024-07-02 d00c7ece7608312ac2f4d6cc01ad9469a992ba7a

花城 修改社区组织共建逻辑

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

@@ -51,6 +51,10 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date estimatedTime;

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

    @ApiModelProperty("协议定制时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date agreementCustomizationTime;

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

@@ -541,7 +541,9 @@
    @PostMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler")
    public R timedNewFightNeedProblemInventoryHandler();

    @PostMapping("/NeedProblem/taskTimed/getListTime")

    //定时任务  社区组织共建  定时更新项目进度
    @PostMapping("/NewFightCommunity/taskTimed/getListTime")
    public R taskTimedGetListTime();



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

@@ -114,19 +114,22 @@

        for (NewFightCommunityConstructionDTO item:list) {

//            if(StringUtils.equals("1",item.getStatus()))
//            {
//                // 1 已发布
//
//
//
//            }
//            else if(StringUtils.equals("2",item.getStatus()))
//            {
//                // 1 进行中
//
//
//            }
            if(StringUtils.equals("1",item.getStatus()))
            {
                // 1 已发布
                Date startTime = item.getStartTime();
                if (startTime!=null)
                {
                    if(new Date().getTime()>startTime.getTime())
                    {
                        NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
                        dto.setId(item.getId());
                        //进行中
                        dto.setStatus("2");
                        baseMapper.editData(dto);
                    }
                }
            }

            //预计完成时间
            Date estimatedTime = item.getEstimatedTime();
@@ -134,9 +137,20 @@
            {
                if(new Date().getTime()>estimatedTime.getTime())
                {
                    int pNum=projectPlanService.getNum(item.getId(),null);
                    int accomplishNum=projectPlanService.getNum(item.getId(),"1");
                    NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
                    dto.setId(item.getId());
                    dto.setStatus("3");
                    if(pNum==accomplishNum)
                    {
                        //已完成
                        dto.setStatus("3");
                    }
                    else
                    {
                        //进行中
                        dto.setStatus("2");
                    }
                    baseMapper.editData(dto);
                }
            }

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

@@ -16,6 +16,7 @@
        update_time,
        user_id,
        status,
        start_time,
        community_id
    </sql>

@@ -63,6 +64,7 @@
            nfcc.update_time,
            nfcc.user_id,
            nfcc.status,
            nfcc.start_time,
            ca.name as communityName,
            ifnull(count(nfpj.id),0) as isJoin,
            nfcc.community_id
@@ -114,6 +116,9 @@
            <if test="item.status != null and item.status != '' " >
                status,
            </if>
            <if test="item.startTime != null " >
                start_time,
            </if>
            creation_time
        </trim>
        values
@@ -150,6 +155,9 @@
            </if>
            <if test="item.status != null and item.status != '' " >
                #{item.status},
            </if>
            <if test="item.startTime != null " >
                #{item.startTime},
            </if>
            sysdate()
        </trim>
@@ -191,6 +199,9 @@
            <if test="item.status != null and item.status != '' " >
                status=#{item.status},
            </if>
            <if test="item.startTime != null " >
                start_time=#{item.startTime},
            </if>
            update_time=sysdate()
        </set>
        where id=#{item.id}
@@ -217,6 +228,7 @@
        nfcc.update_time,
        nfcc.user_id,
        nfcc.status,
        nfcc.start_time,
        nfcc.community_id
        FROM new_fight_community_construction as nfcc
        where nfcc.status in (1,2)