最新

huanghongfa

2021-01-28 74523006ddd9ee53c7042950de71ee73dac57957

最新

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,22 +23,17 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaCityVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaProvinceVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityActivitiesVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityGovernanceTrendsVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/IndexDataVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/IndexDataVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/TodoEventsVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/TodoEventsVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/TodoEventsVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/TodoEventsVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/IndexApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/IndexApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructAreaDistrictService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructAreaDistrictService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerMngService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerMngService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -423,7 +418,7 @@
      <workItem from="1611019208339" duration="94460000" />
      <workItem from="1611365644515" duration="33195000" />
      <workItem from="1611536010905" duration="21843000" />
      <workItem from="1611622682269" duration="54478000" />
      <workItem from="1611622682269" duration="56991000" />
    </task>
    <servers />
  </component>
@@ -451,10 +446,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="464" y="213" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1536.824@0.0.1536.824" timestamp="1611735657367" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611818599365">
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611823461616">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611818599365" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611823461616" />
    <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -471,10 +466,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608878808962" />
    <state width="562" height="466" key="DebuggerActiveHint" timestamp="1611734911266">
    <state width="562" height="466" key="DebuggerActiveHint" timestamp="1611823693933">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611734911266" />
    <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611823693933" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -483,54 +478,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1031" height="306" key="GridCell.Tab.0.bottom" timestamp="1611821842303">
    <state width="1031" height="566" key="GridCell.Tab.0.bottom" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611821842303" />
    <state width="1031" height="306" key="GridCell.Tab.0.center" timestamp="1611821842303">
    <state width="1031" height="566" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state width="1031" height="566" key="GridCell.Tab.0.center" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611821842303" />
    <state width="1031" height="306" key="GridCell.Tab.0.left" timestamp="1611821842302">
    <state width="1031" height="566" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state width="1031" height="566" key="GridCell.Tab.0.left" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611821842302" />
    <state width="1031" height="306" key="GridCell.Tab.0.right" timestamp="1611821842303">
    <state width="1031" height="566" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state width="1031" height="566" key="GridCell.Tab.0.right" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611821842303" />
    <state width="1031" height="306" key="GridCell.Tab.1.bottom" timestamp="1611821842303">
    <state width="1031" height="566" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state width="1031" height="566" key="GridCell.Tab.1.bottom" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611821842303" />
    <state width="1031" height="306" key="GridCell.Tab.1.center" timestamp="1611821842303">
    <state width="1031" height="566" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state width="1031" height="566" key="GridCell.Tab.1.center" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611821842303" />
    <state width="1031" height="306" key="GridCell.Tab.1.left" timestamp="1611821842303">
    <state width="1031" height="566" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state width="1031" height="566" key="GridCell.Tab.1.left" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611821842303" />
    <state width="1031" height="306" key="GridCell.Tab.1.right" timestamp="1611821842303">
    <state width="1031" height="566" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state width="1031" height="566" key="GridCell.Tab.1.right" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611821842303" />
    <state width="1031" height="306" key="GridCell.Tab.2.bottom" timestamp="1611821842303">
    <state width="1031" height="566" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state width="1031" height="566" key="GridCell.Tab.2.bottom" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611821842303" />
    <state width="1031" height="306" key="GridCell.Tab.2.center" timestamp="1611821842303">
    <state width="1031" height="566" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state width="1031" height="566" key="GridCell.Tab.2.center" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611821842303" />
    <state width="1031" height="306" key="GridCell.Tab.2.left" timestamp="1611821842303">
    <state width="1031" height="566" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state width="1031" height="566" key="GridCell.Tab.2.left" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611821842303" />
    <state width="1031" height="306" key="GridCell.Tab.2.right" timestamp="1611821842303">
    <state width="1031" height="566" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state width="1031" height="566" key="GridCell.Tab.2.right" timestamp="1611823801477">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="306" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611821842303" />
    <state width="1031" height="566" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611823801477" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -543,10 +538,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="270" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1606120706449" />
    <state width="498" height="540" key="SwitcherDM" timestamp="1611561325465">
    <state width="498" height="540" key="SwitcherDM" timestamp="1611823082750">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1611561325465" />
    <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1611823082750" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1609398421992">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java

@@ -89,6 +89,11 @@
       return communityService.listAreaDistrict(cityAdcode);
    }

    @ApiOperation(value = "社区详情",response = ComActVO.class)
    @GetMapping("community")
    public R detailCommunity(@RequestParam("id") Long id){
        return communityService.detailCommunity(id);
    }




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

@@ -13,12 +13,8 @@
@Data
@ApiModel("代办事件")
public class TodoEventsVO {
    @ApiModelProperty("功能")
    private String function;
    @ApiModelProperty("行为")
    private String behavior;
    @ApiModelProperty("文字")
    private String words;
    @ApiModelProperty("类型 1随手拍 2微心愿 3人脸采集 4志愿者审核")
    @ApiModelProperty("数量")
    private Integer num;
    @ApiModelProperty("类型 1随手拍 2微心愿 3一起议 4志愿者审核")
    private Integer type;
}

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/TodoEventsVO.class

Binary files differ

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

@@ -52,20 +52,6 @@
            if (R.isOk(r1)) {
                Object data1 = r1.getData();
                List<TodoEventsVO> todoEventsVOS = JSONArray.parseArray(JSONArray.toJSONString(data1), TodoEventsVO.class);
                if (!ObjectUtils.isEmpty(todoEventsVOS)) {
                    todoEventsVOS.forEach(todoEventsVO -> {
                        String function = todoEventsVO.getFunction();
                        if (function.contains("随手拍")) {
                            todoEventsVO.setType(1);
                        } else if (function.contains("微心愿")) {
                            todoEventsVO.setType(2);
                        } else if (function.contains("人脸采集")) {
                            todoEventsVO.setType(3);
                        } else if (function.contains("志愿者审核")) {
                            todoEventsVO.setType(4);
                        }
                    });
                }
                indexDataVO.setTodoEventsVOList(todoEventsVOS);
                r.setData(indexDataVO);
            }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -1018,15 +1018,19 @@
        List<TodoEventsVO> todoEventsVOS1=comActEasyPhotoService.selectNeedToDo(communityId,userId);
        List<TodoEventsVO> todoEventsVOS2=comActMicroWishService.selectNeedToDo(communityId,userId);
        List<TodoEventsVO> todoEventsVOS3=comMngVolunteerMngService.selectNeedToDo(communityId,userId);
        if (!ObjectUtils.isEmpty(todoEventsVOS1)) {
            todoEventsVOS.addAll(todoEventsVOS1);
        }
        if (!ObjectUtils.isEmpty(todoEventsVOS2)) {
            todoEventsVOS.addAll(todoEventsVOS2);
        }
        if (!ObjectUtils.isEmpty(todoEventsVOS3)) {
            todoEventsVOS.addAll(todoEventsVOS3);
        }

        TodoEventsVO todoEventsVO=new TodoEventsVO();
        todoEventsVO.setType(1);
        todoEventsVO.setNum(todoEventsVOS1.size());
        TodoEventsVO todoEventsVO1=new TodoEventsVO();
        todoEventsVO1.setType(2);
        todoEventsVO1.setNum(todoEventsVOS2.size());
        TodoEventsVO todoEventsVO2=new TodoEventsVO();
        todoEventsVO2.setType(4);
        todoEventsVO2.setNum(todoEventsVOS3.size());
        todoEventsVOS.add(todoEventsVO);
        todoEventsVOS.add(todoEventsVO1);
        todoEventsVOS.add(todoEventsVO2);
        return R.ok(todoEventsVOS);
    }


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

@@ -163,30 +163,23 @@
            "WHERE p.id=#{id}")
    ComActEasyPhotoVO detailEasyPhoto(Long id);
    @Select("SELECT\n" +
            "'随手拍' FUNCTION,\n" +
            "'待审核' behavior,\n" +
            "'新增随手拍动态待审核' words \n" +
            "'1' type\n" +
            "FROM\n" +
            "com_act_easy_photo p \n" +
            "WHERE\n" +
            "p.community_id = #{communityId} \n" +
            "AND p.STATUS = 1 \n" +
            "GROUP BY\n" +
            "p.community_id\n" +
            "\n" +
            "union all \n" +
            "\n" +
            "SELECT\n" +
            "'随手拍' FUNCTION,\n" +
            "'需要进行反馈' behavior,\n" +
            "'随手拍有待反馈动态' words \n" +
            "'1' type\n" +
            "FROM\n" +
            "com_act_easy_photo p \n" +
            "WHERE\n" +
            "p.community_id = #{communityId} \n" +
            "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n" +
            "GROUP BY\n" +
            "p.community_id")
            "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n"
            )
    List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);

    @Select("<script> " +

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

@@ -126,9 +126,7 @@
    )
    ComActMicroWishVO detailMicroWish(Long id);
    @Select("SELECT\n" +
            "'微心愿' FUNCTION,\n" +
            "'待审核' behavior,\n" +
            "'新增微心愿动态待审核' words \n" +
            "'2' type\n" +
            "FROM\n" +
            "com_act_micro_wish w \n" +
            "WHERE\n" +
@@ -138,9 +136,7 @@
            "union all \n" +
            "\n" +
            "SELECT\n" +
            "\t'微心愿' FUNCTION,\n" +
            "\t'需要进行反馈' behavior,\n" +
            "\t'微心愿有待反馈动态' words \n" +
            "'2' type\n" +
            "FROM\n" +
            "\tcom_act_micro_wish w \n" +
            "WHERE\n" +

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

@@ -78,29 +78,17 @@
            " \tORDER BY t.state asc  " +
            "</script>")
    IPage<ComMngVolunteerMngVO> pageVolunteerExamine(Page page, @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);
    @Select("SELECT\n" +
            "'人脸采集' FUNCTION,\n" +
            "'待审核' behavior,\n" +
            "'新增人脸采集信息待审核' words \n" +
            "FROM\n" +
            "sys_user u \n" +
            "WHERE\n" +
            "u.face_state = 0 \n" +
            "AND u.community_id = #{communityId} \n" +
            "GROUP BY\n" +
            "u.community_id UNION ALL\n" +
    @Select(
            "SELECT\n" +
            "'志愿者审核' FUNCTION,\n" +
            "'待审核' behavior,\n" +
            "'新增志愿者申请待审核' words \n" +
            "'4' type\n" +
            "FROM\n" +
            "com_mng_volunteer_mng v \n" +
            "WHERE\n" +
            "v.state = 1 \n" +
            "AND v.`community_id` = #{communityId} \n" +
            "GROUP BY\n" +
            "v.community_id")
            "AND v.`community_id` = #{communityId} \n"
           )
    List<TodoEventsVO> selectNeedToDo(Long communityId);
    @Select("select user_id from sys_user where type=1 and phone=#{phone}")
    Long selectUserIdByPhone(String phone);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerMngService.java

@@ -82,4 +82,5 @@
     * @return 人脸采集和志愿者审核集合
     */
    List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId);

}

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

@@ -230,4 +230,6 @@
    }




}