bug修复

huanghongfa

2021-09-27 2421415e0f4f89955e9435fb14dff2780c2e9ed4

bug修复

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java

@@ -122,7 +122,7 @@
    private Integer authNoAmount;

    @ApiModelProperty(value = "待审核状态id集合列表")
    private List<Long> nextIds;
    private List<String> nextIds;

    @ApiModelProperty(value = "社区id")
    private Long communityId;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java

@@ -1,6 +1,7 @@
package com.panzhihua.common.model.vos.community;

import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -111,4 +112,9 @@
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

    @ApiModelProperty(value = "待处理id集合")
    private List<String> nextIds;

    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComElderAuthRecordsDAO.java

@@ -58,5 +58,5 @@
     * @param authRecordId   需要排除的详情id
     * @return  待审核高龄认证记录id集合
     */
    List<Long> getNextIds(@Param("communityId") Long communityId,@Param("authRecordId") Long authRecordId);
    List<String> getNextIds(@Param("communityId") Long communityId,@Param("authRecordId") Long authRecordId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPensionAuthRecordDAO.java

@@ -50,4 +50,12 @@
     * @return ComPensionAuthRecordVO
     */
    IdentityAuthRecordDetailVO findById(@Param("identityAuthId") Long identityAuthId);

    /**
     * 查询养老认证待处理id集合
     * @param communityId   社区id
     * @param authRecordId  养老认证记录id
     * @return  养老认证待处理id集合
     */
    List<String> getNextIds(@Param("communityId") Long communityId,@Param("authRecordId") Long authRecordId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java

@@ -119,6 +119,7 @@
    @Override
    public R detailPensionAuthRecords(Long authRecordId) {
        ComPensionAuthRecordVO comPensionAuthRecordVO = comPensionAuthRecordDAO.detailPensionAuthRecords(authRecordId);
        comPensionAuthRecordVO.setNextIds(comPensionAuthRecordDAO.getNextIds(comPensionAuthRecordVO.getCommunityId(),authRecordId));
        return R.ok(comPensionAuthRecordVO);
    }


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

@@ -320,7 +320,7 @@
        order by ceahr.create_at desc
    </select>

    <select id="getNextIds" resultType="long">
    <select id="getNextIds" resultType="String">
        select id from com_elder_auth_records where approval_status = 1 and community_id = #{communityId} and id != #{authRecordId}
    </select>


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

@@ -100,6 +100,7 @@
            cpar.auth_method,
            cpar.auth_video,
            cpar.approval_status,
            cpar.community_id,
            cpar.id,
            su1.`name` as approverName,
            cpar.approval_date
@@ -339,4 +340,8 @@
        LEFT JOIN `com_act` ca ON cpap.community_id = ca.community_id
        WHERE cpar.id = #{identityAuthId}
    </select>

    <select id="getNextIds" resultType="String">
        select id from com_pension_auth_records where approval_status = 1 and community_id = #{communityId} and id != #{authRecordId}
    </select>
</mapper>