修改bug

huanghongfa

2021-07-08 aba489c74e27e36ece27c5e1b8f591560775cf90

修改bug

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

@@ -7,10 +7,10 @@
public enum  EventTasksStatusEnum {

    DZF(1,"待走访"),
    JXZ(2,"进行中"),
    ZJJJ(3,"正常"),
    DYZ(4,"待验证"),
    CG(5,"草稿"),
    YJJ(2,"已解决"),
    ZJJJ(3,"待验证"),
    DYZ(4,"草稿箱"),
    CG(5,"已撤销"),
    YCX(6,"已撤销"),
    YC(7,"异常"),
    ;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActUserWalletTradeDOMapper.xml

@@ -37,6 +37,8 @@
            LEFT JOIN com_act AS ca ON ca.community_id = cauwt.community_id
            where cauwt.community_id = #{walletTradeDTO.communityId}
            and cauwt.user_id = #{walletTradeDTO.userId}

            order by cauwt.create_at desc
    </select>

    <select id="getUserWalletTradeAdmin" parameterType="com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO"

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

@@ -405,7 +405,7 @@
        start.setGridMember(Long.valueOf(map.get("user_id").toString()));
        start.setGridMemberName(map.get("name").toString());
        start.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());
        start.setEventStatus(EventTasksStatusEnum.JXZ.getCode());
        start.setEventStatus(EventTasksStatusEnum.YJJ.getCode());
        int rt = eventVisitingTasksMapper.start(start);
        if(rt > 0){
            return R.ok();
@@ -433,11 +433,8 @@

        EventVisitingTasksDO complete = new EventVisitingTasksDO();
        BeanUtils.copyProperties(taskCompleteDTO,complete);
        if(taskCompleteDTO.getException() == 0){
            complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode());
        }else{
            complete.setEventStatus(EventTasksStatusEnum.YC.getCode());
        }
        complete.setEventStatus(EventTasksStatusEnum.YJJ.getCode());

        complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT));
        if(StringUtils.isNotEmpty(eventVisitingTasksDO.getTableContentJson())){
            JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
@@ -470,7 +467,7 @@
        complete.setGridMemberName(map.get("name").toString());
        complete.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());

        int rt = eventVisitingTasksMapper.complete(complete);
        int rt = eventVisitingTasksMapper.updateById(complete);
        if(rt > 0){
            return R.ok();
        }

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

@@ -275,8 +275,7 @@
        FROM
            event_visiting_tasks
        WHERE
            event_status = 1
            OR event_status = 3
            grid_id = #{eventGridTodoDataDTO.gridId} and (event_status = 1 OR event_status = 3)
    </select>

    <select id="getComActByActId" resultType="com.panzhihua.common.model.vos.grid.ComGridActVO">

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

@@ -126,6 +126,9 @@
        <if test = "query.exception != null">
            and vt.exception = #{query.exception}
        </if>
        <if test = "query.status != null and query.status == 2">
            and vt.event_status = 2
        </if>
        <if test = "query.eventStatus == 3 or query.eventStatus == 7">
            and vt.event_status = #{query.eventStatus}
        </if>