Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-21 233d249818f4f4ed089491942c7aa0f1bc2033d5

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java

@@ -107,4 +107,6 @@
    @ApiModelProperty(value = "创建结束时间", hidden = false, example = "2021-05-02 18:05:50")
    private Date createAtEnd;

    @ApiModelProperty(value = "社区ID", hidden = false, example = "")
    private Long communityId;
}

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

@@ -89,6 +89,7 @@
    @ApiOperation(value = "查询高龄认证", response = EldersAuthVO.class)
    R query(@Validated @RequestBody PageEldersAuthDTO pageEldersAuthDTO){
        ClazzUtils.setIfStringIsEmpty(pageEldersAuthDTO);
        pageEldersAuthDTO.setCommunityId(this.getCommunityId());
        return communityService.query(pageEldersAuthDTO);
    }

@@ -118,6 +119,7 @@
        String uuid= UUID.randomUUID().toString().replace("-","");
        //String name=uuid+".xlsx";

        pageEldersAuthDTO.setCommunityId(getCommunityId());
        R r = communityService.eldersAuthQuery(pageEldersAuthDTO);
        if (R.isOk(r)) {
            List<ExcelElderAuthDTO> excelElderAuthDTO = JSONArray.parseArray(JSONArray.toJSONString(r.getData()),ExcelElderAuthDTO.class);

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

@@ -39,7 +39,13 @@
            " ) t  " +
            " LEFT JOIN com_elders_auth ea ON t.id = ea.id  " +
            " LEFT JOIN sys_user  u ON ea.SUMIT_USER_ID = u.user_id\n" +
            " LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" +
            " <where> " +

            "<if test='pageEldersAuthDTO.communityId != null'>" +
            "  AND ac.community_id = #{pageEldersAuthDTO.communityId} " +
            " </if> " +

            "<if test='pageEldersAuthDTO.sumitUserId != null'>" +
            " AND ea.SUMIT_USER_ID = #{pageEldersAuthDTO.sumitUserId} " +
            " </if> " +
@@ -103,6 +109,10 @@
            " LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" +
            " <where> " +

            "<if test='pageEldersAuthDTO.communityId != null'>" +
            "  AND ac.community_id = #{pageEldersAuthDTO.communityId} " +
            " </if> " +

            "<if test='pageEldersAuthDTO.ids != null and pageEldersAuthDTO.ids.length>0 '>" +
            " AND ea.id in " +
            "<foreach collection='pageEldersAuthDTO.ids' item='id' index='index' open='(' close=')' separator=',' >\n" +