志愿者审核

huanghongfa

2021-01-26 ecf9d24221102b02e15a462f295301d5fce7f9ab

志愿者审核

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,11 +24,7 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <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/dtos/partybuilding/ComPbServiceTeamDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.class" 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/service/impl/ComActEasyPhotoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -413,7 +409,7 @@
      <workItem from="1611019208339" duration="94460000" />
      <workItem from="1611365644515" duration="33195000" />
      <workItem from="1611536010905" duration="21843000" />
      <workItem from="1611622682269" duration="15638000" />
      <workItem from="1611622682269" duration="17859000" />
    </task>
    <servers />
  </component>
@@ -469,54 +465,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="417" key="GridCell.Tab.0.bottom" timestamp="1611650471026">
    <state width="1031" height="417" key="GridCell.Tab.0.bottom" timestamp="1611652976539">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611650471026" />
    <state width="1031" height="417" key="GridCell.Tab.0.center" timestamp="1611650471025">
    <state width="1031" height="417" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611652976539" />
    <state width="1031" height="417" key="GridCell.Tab.0.center" timestamp="1611652976539">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611650471025" />
    <state width="1031" height="417" key="GridCell.Tab.0.left" timestamp="1611650471025">
    <state width="1031" height="417" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611652976539" />
    <state width="1031" height="417" key="GridCell.Tab.0.left" timestamp="1611652976539">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611650471025" />
    <state width="1031" height="417" key="GridCell.Tab.0.right" timestamp="1611650471026">
    <state width="1031" height="417" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611652976539" />
    <state width="1031" height="417" key="GridCell.Tab.0.right" timestamp="1611652976539">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611650471026" />
    <state width="1031" height="417" key="GridCell.Tab.1.bottom" timestamp="1611650471026">
    <state width="1031" height="417" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611652976539" />
    <state width="1031" height="417" key="GridCell.Tab.1.bottom" timestamp="1611652976540">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611650471026" />
    <state width="1031" height="417" key="GridCell.Tab.1.center" timestamp="1611650471026">
    <state width="1031" height="417" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611652976540" />
    <state width="1031" height="417" key="GridCell.Tab.1.center" timestamp="1611652976540">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611650471026" />
    <state width="1031" height="417" key="GridCell.Tab.1.left" timestamp="1611650471026">
    <state width="1031" height="417" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611652976540" />
    <state width="1031" height="417" key="GridCell.Tab.1.left" timestamp="1611652976540">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611650471026" />
    <state width="1031" height="417" key="GridCell.Tab.1.right" timestamp="1611650471026">
    <state width="1031" height="417" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611652976540" />
    <state width="1031" height="417" key="GridCell.Tab.1.right" timestamp="1611652976540">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611650471026" />
    <state width="1031" height="417" key="GridCell.Tab.2.bottom" timestamp="1611650471026">
    <state width="1031" height="417" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611652976540" />
    <state width="1031" height="417" key="GridCell.Tab.2.bottom" timestamp="1611652976540">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611650471026" />
    <state width="1031" height="417" key="GridCell.Tab.2.center" timestamp="1611650471026">
    <state width="1031" height="417" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611652976540" />
    <state width="1031" height="417" key="GridCell.Tab.2.center" timestamp="1611652976540">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611650471026" />
    <state width="1031" height="417" key="GridCell.Tab.2.left" timestamp="1611650471026">
    <state width="1031" height="417" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611652976540" />
    <state width="1031" height="417" key="GridCell.Tab.2.left" timestamp="1611652976540">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611650471026" />
    <state width="1031" height="417" key="GridCell.Tab.2.right" timestamp="1611650471026">
    <state width="1031" height="417" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611652976540" />
    <state width="1031" height="417" key="GridCell.Tab.2.right" timestamp="1611652976540">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611650471026" />
    <state width="1031" height="417" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611652976540" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

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

@@ -53,26 +53,29 @@

    @Select("<script> " +
            "SELECT\n" +
            "id,\n" +
            "`name`,\n" +
            "state,\n" +
            "phone,\n" +
            "apply_reson,\n" +
            "create_at \n" +
            "t.id,\n" +
            "t.`name`,\n" +
            "t.state,\n" +
            "t.phone,\n" +
            "t.apply_reson,\n" +
            "t.create_at \n" +
            "FROM\n" +
            "com_mng_volunteer_mng \n" +
            "com_mng_volunteer_mng t\n" +
            " RIGHT JOIN \n" +
            "(select phone, MAX(create_at)create_at  from com_mng_volunteer_mng where state IN ( 1, 3 ) GROUP BY phone ) tmp \n" +
            "on t.create_at = tmp.create_at and t.phone=tmp.phone "+
            "WHERE\n" +
            "state in (1,3)  and community_id=#{comMngVolunteerMngVO.communityId} \n" +
            "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != &quot;&quot;'>" +
            "and name like concat(#{comMngVolunteerMngVO.name},'%')  \n" +
            "and t.name like concat(#{comMngVolunteerMngVO.name},'%')  \n" +
            " </if> " +
            "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != &quot;&quot;'>" +
            "AND phone like concat(#{comMngVolunteerMngVO.phone},'%')\n" +
            "AND t.phone like concat(#{comMngVolunteerMngVO.phone},'%')\n" +
            " </if> " +
            "<if test='comMngVolunteerMngVO.state != null and comMngVolunteerMngVO.state != 0'>" +
            "and state=#{comMngVolunteerMngVO.state}\n" +
            "and t.state=#{comMngVolunteerMngVO.state}\n" +
            " </if> " +
            " \tgroup by phone,state ORDER BY state asc " +
            " \tORDER BY t.state asc  " +
            "</script>")
    IPage<ComMngVolunteerMngVO> pageVolunteerExamine(Page page, @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);
    @Select("SELECT\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java

@@ -50,7 +50,7 @@
            "WHERE\n" +
            "m.member_id = #{id} \n" +
            "<if test='name != null and name.trim() != &quot;&quot;'>" +
            "AND a.`name` = #{name} \n" +
            "AND a.`name` like concat (#{name},'%')  \n" +
            " </if> " +
            "<if test='releaseTimeBegin != null '>" +
            "AND a.create_at BETWEEN #{releaseTimeBegin} \n" +