修改bug

huanghongfa

2021-07-14 d55aa8ce835cd7150dca26280f15fa0b60f37864

修改bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventStatusEnum.java

@@ -10,8 +10,8 @@
@Getter
public enum EventStatusEnum
{
    DCL(1, "待处理"),
    YJJ(2, "已解决"),
    DCL(1, "待走访"),
    YJJ(2, "已走访"),
    DYZ(3, "待验证"),
    CGX(4, "草稿箱"),
    YCX(5, "已撤销"),

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridDataDO.java

@@ -72,6 +72,7 @@
    /**
     * 备注   列: remarks
     */
    @TableField(fill = FieldFill.UPDATE)
    private String remarks;
    /**
     * 围栏数据   列: data

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java

@@ -231,6 +231,7 @@
        EventGridDataDO gridDataDO = this.baseMapper.selectById(eventGridDataDTO.getGridId());
        if(gridDataDO != null){
            BeanUtils.copyProperties(eventGridDataDTO,gridDataDO);
            gridDataDO.setRemarks(eventGridDataDTO.getRemarks());
            gridDataDO.setUpdateBy(eventGridDataDTO.getUserId());
            if(this.baseMapper.updateById(gridDataDO) > 0){
                //移除网格员和网格关系

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -735,15 +735,20 @@
    public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
        //boolean canRepublishByUser = eventDO.getEventStatus() == 4 || eventDO.getEventStatus() == 1;
        boolean canRepublishByUser = eventDO.getEventDealStatus() == 7|eventDO.getEventDealStatus() == 5; //已失效状态
        boolean canRepublishByUser = eventDO.getEventDealStatus() == 6|eventDO.getEventDealStatus() == 5; //已失效状态
        if (!canRepublishByUser) {
            return R.fail("当前不是撤销/草稿状态");
        }

        if(eventDO.getEventCategory().equals(2L)){//宣传教育
            eventDO.setEventDealStatus(8);
        }else{
            eventDO.setEventProcessStatus(1); //待解决
            eventDO.setProcessType(1);   //网格员处理
        }
        eventDO.setEventStatus(2);//2 发布
        eventDO.setEventProcessStatus(1); //待解决
        eventDO.setProcessType(1);   //网格员处理
        eventDO.setUpdateBy(commonEventRepublishDTO.getUserId());

        int updated = this.getBaseMapper().updateById(eventDO);
        if (updated != 1) {
            return R.fail("更新事件状态失败");
@@ -2260,7 +2265,7 @@
            workScreenVO.setResolvedNum(countMap.get("resolvedNum")== null ? 0L : Long.valueOf(countMap.get("resolvedNum").toString()));
            workScreenVO.setPendingNum(countMap.get("pendingNum")== null ? 0L : Long.valueOf(countMap.get("pendingNum").toString()));
            workScreenVO.setPropagandaNum(countMap.get("propagandaNum")== null ? 13L : Long.valueOf(countMap.get("propagandaNum").toString()));
            workScreenVO.setCurrentNum(countMap.get("currentNum")== null ? 0L : Long.valueOf(countMap.get("currentNum").toString()));
            workScreenVO.setCurrentNum(countMap.get("sspCurrentNum") + countMap.get("currentNum"));
        }

        //计算处理时间消耗的时间

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java

@@ -34,6 +34,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import static java.util.stream.Collectors.collectingAndThen;
import static java.util.stream.Collectors.toCollection;

import javax.annotation.Resource;
import java.util.*;
@@ -41,6 +43,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * @auther lyq
@@ -182,7 +185,7 @@
            EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(id));
            if(eventVisitingTasksDO != null){
                if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
                    return R.fail("您选择的走访任务中有已解决的不可删除");
                    return R.fail("您选择的走访任务中有已走访的不可删除");
                }
                eventVisitingTasksMapper.deleteById(id);
            }

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml

@@ -43,7 +43,7 @@
        egd.fill_color,
        egd.data,
        egd.create_at,
        egd.create_by,
        su1.`name` sa createBy,
        egd.grid_community_id,
        (select lc_grid_name from lc_compare_code where local_grid_id = egd.id) as lcGirdName,
        (select id from lc_compare_code where local_grid_id = egd.id) as lcGirdId,
@@ -53,6 +53,7 @@
        LEFT JOIN com_act AS ca ON ca.community_id = egd.grid_community_id
        LEFT JOIN event_grid_member_relation AS egmr ON egmr.grid_id = egd.id
        left join sys_user as su on su.user_id = egmr.grid_member_id
        left join sys_user as su1 on su1.user_id = egd.create_by
        <where>
            <if test="pageEventGridDataDTO.gridStreetId!=null">
                AND egd.grid_street_id = #{pageEventGridDataDTO.gridStreetId}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml

@@ -279,7 +279,7 @@
                    AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime}
                </if>
            ) AS handleTSTotal,
            ( SELECT count( id ) FROM event_visiting_tasks WHERE dell_user_id = su.user_id AND event_status = 2
            ( SELECT count( id ) FROM event_visiting_tasks WHERE grid_member = su.user_id AND event_status = 2
                <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != &quot;&quot;">
                    AND DATE_FORMAT(dell_date,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime}
                </if>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml

@@ -1027,7 +1027,8 @@
                LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id
            WHERE
                e3.event_status = 2
                AND e3.create_at LIKE CONCAT(#{nowDate},'%')) as currentNum
                AND e3.create_at LIKE CONCAT(#{nowDate},'%')) as currentNum,
                (select count(id) from com_act_easy_photo where community_id = 2 and del_tag = 0 and create_at LIKE CONCAT('2021-07','%')) as sspCurrentNum

                FROM
                    `event` AS e

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml

@@ -105,6 +105,7 @@
        <if test = "query.status == 0">
            and (vt.event_status = 1 or vt.event_status = 3 or vt.event_status = 6 or vt.event_status = 6)
        </if>
        group by cardNoStr
        order by vt.id desc
    </select>